diff --git a/addons/account/account.py b/addons/account/account.py index 3c7c14737c1..031a803d64c 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3414,6 +3414,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): all the provided information to create the accounts, the banks, the journals, the taxes, the tax codes, the accounting properties... accordingly for the chosen company. ''' + if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager'): + raise openerp.exceptions.AccessError(_("Only administrators can change the settings")) obj_data = self.pool.get('ir.model.data') ir_values_obj = self.pool.get('ir.values') obj_wizard = self.browse(cr, uid, ids[0]) @@ -3430,7 +3432,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): self.pool[tmp2[0]].write(cr, uid, tmp2[1], { 'currency_id': obj_wizard.currency_id.id }) - except ValueError, e: + except ValueError: pass # If the floats for sale/purchase rates have been filled, create templates from them diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 0e17cb39113..f8b9fd115b4 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-12-27 22:48+0000\n" -"Last-Translator: Balint (eSolve) \n" +"PO-Revision-Date: 2013-12-02 19:56+0000\n" +"Last-Translator: krnkris \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: 2013-09-12 05:27+0000\n" -"X-Generator: Launchpad (build 16761)\n" +"X-Launchpad-Export-Date: 2013-12-03 05:41+0000\n" +"X-Generator: Launchpad (build 16856)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -26,6 +26,8 @@ msgstr "Kifizetési rendszer" msgid "" "An account fiscal position could be defined only once time on same accounts." msgstr "" +"Egy könyvelés költségvetési évfordulóját csak egyszer lehet megadni az arra " +"hivatkozó számlákra vonatkozólag." #. module: account #: help:account.tax.code,sequence:0 @@ -60,7 +62,7 @@ msgstr "Rendezetlen összeg" #: code:addons/account/account_bank_statement.py:369 #, python-format msgid "Journal item \"%s\" is not valid." -msgstr "" +msgstr "A \"%s\" könyvelési napló tétel nem érvényes." #. module: account #: model:ir.model,name:account.model_report_aged_receivable @@ -78,7 +80,7 @@ msgstr "Importálás számlából vagy pénzügyi rendezésből" #: code:addons/account/account_move_line.py:1210 #, python-format msgid "Bad Account!" -msgstr "" +msgstr "Eltévesztett könyvelési számla!" #. module: account #: view:account.move:0 @@ -92,6 +94,8 @@ msgid "" "Error!\n" "You cannot create recursive account templates." msgstr "" +"Hiba!\n" +"Nem hozhat létre visszatérő számla sablonokat." #. module: account #. openerp-web @@ -102,7 +106,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:30 #, python-format msgid "Reconcile" -msgstr "Párosítás" +msgstr "Egyeztetés" #. module: account #: field:account.bank.statement,name:0 @@ -114,7 +118,7 @@ msgstr "Párosítás" #: xsl:account.transfer:0 #: field:cash.box.in,ref:0 msgid "Reference" -msgstr "Hivatkozás" +msgstr "Információforrás" #. module: account #: help:account.payment.term,active:0 @@ -122,7 +126,8 @@ msgid "" "If the active field is set to False, it will allow you to hide the payment " "term without removing it." msgstr "" -"Ha az aktív mező nincs bejelölve, nem használható a fizetési feltétel." +"Ha az aktív mező hamisra van állatva, akkor a fizetési feltételt " +"eltüntetheti anélkül, hogy törölné azt." #. module: account #: code:addons/account/account.py:641 @@ -151,7 +156,7 @@ msgstr "Figyelem!" #: code:addons/account/account.py:3197 #, python-format msgid "Miscellaneous Journal" -msgstr "Vegyes napló" +msgstr "Vegyes könyvelési napló" #. module: account #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39 @@ -161,6 +166,8 @@ msgid "" "which is set after generating opening entries from 'Generate Opening " "Entries'." msgstr "" +"Be kell állítania az 'Év végi belépő könyvelési naplót' ehhez a 'Nyitási " +"tétel létrehozása' menüvel létrehozott üzlez év tételeihez." #. module: account #: field:account.fiscal.position.account,account_src_id:0 @@ -879,7 +886,7 @@ msgstr "Párosítás visszavonása" #. module: account #: model:ir.model,name:account.model_account_analytic_journal_report msgid "Account Analytic Journal" -msgstr "Gyűjtőnapló" +msgstr "Gyűjtőnapló számla" #. module: account #: view:account.invoice:0 @@ -1475,7 +1482,7 @@ msgstr "Listázási beállítások" #. module: account #: field:account.fiscalyear.close.state,fy_id:0 msgid "Fiscal Year to Close" -msgstr "" +msgstr "Bezárni kívánt üzleti év" #. module: account #: field:account.config.settings,sale_sequence_prefix:0 @@ -1553,7 +1560,7 @@ msgstr "Adók keresése" #. module: account #: model:ir.model,name:account.model_account_analytic_cost_ledger msgid "Account Analytic Cost Ledger" -msgstr "Gyűjtőkód karton" +msgstr "Főkönyvi költség gyűjtőkód karton számla" #. module: account #: view:account.model:0 @@ -1624,6 +1631,8 @@ msgid "" "By unchecking the active field, you may hide a fiscal position without " "deleting it." msgstr "" +"Az aktív mező üresen hagyásával, eltüntetheti az ÁFA helyét, annak törlése " +"nélkül." #. module: account #: model:ir.model,name:account.model_temp_range @@ -2194,7 +2203,7 @@ msgstr "Korosított folyószámla kivonat" #. module: account #: view:account.fiscalyear.close.state:0 msgid "Close Fiscal Year" -msgstr "" +msgstr "Üzleti év lezárása" #. module: account #. openerp-web @@ -2207,6 +2216,7 @@ msgstr "" #: sql_constraint:account.fiscal.position.tax:0 msgid "A tax fiscal position could be defined only once time on same taxes." msgstr "" +"Az adó adóügyi pozíciója csak egyszer határozható meg ugyanarra az adóra." #. module: account #: view:account.tax:0 @@ -2320,7 +2330,7 @@ msgstr "Részleges tételsorok" #: view:account.fiscalyear:0 #: field:account.treasury.report,fiscalyear_id:0 msgid "Fiscalyear" -msgstr "Üzleti év" +msgstr "Üzletiév" #. module: account #: code:addons/account/wizard/account_move_bank_reconcile.py:53 @@ -2963,6 +2973,22 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Kattintson új adóügyi év létrehozásához.\n" +"

\n" +" Határozza meg a vállalkozása üzleti évét a kívánságainak " +"megfelelően.\n" +" Egy üzleti év egy idő periódus, aminek a végén a vállalkozás " +"könyvelése\n" +" elszámolásra kerül (általában 12 hónap). Az üzleti év arra a " +"dátumra\n" +" hivatkozik általában ahol az véget ér. Például,\n" +" ha a vállalkozás pénzügyi üzleti éve 2011 november 30-ára " +"esik, akkor\n" +" minden ami 2010 december 1 és 2011 november 30 közé esik\n" +" azt hívjuk 2011 évi üzleti/pénzügyi/adóügyi évnek.\n" +"

\n" +" " #. module: account #: view:account.common.report:0 @@ -3912,6 +3938,8 @@ msgid "" "There is no fiscal year defined for this date.\n" "Please create one from the configuration of the accounting menu." msgstr "" +"Erre a dátumra nem lett üzleti adóügyi év meghatározva.\n" +"Kérem hozzon létre egyet a könyvelési menü beállítása menüpont alatt." #. module: account #: view:account.addtmpl.wizard:0 @@ -4282,6 +4310,8 @@ msgid "" "The fiscalyear, periods or chart of account chosen have to belong to the " "same company." msgstr "" +"Az üzelti adóügyi év, periódus vagy számlatükör kiválasztása ugyanarra a " +"vállalkozásra kell, hogy vonatkozzon." #. module: account #: help:account.tax.code.template,notprintable:0 @@ -7344,6 +7374,8 @@ msgid "" "Error!\n" "The start date of a fiscal year must precede its end date." msgstr "" +"Hiba!\n" +"Az üzleti adóügyi év elejének előbb kell lennie mint a végének." #. module: account #: view:account.tax.template:0 @@ -8276,7 +8308,8 @@ msgstr "" msgid "" "Select Fiscal Year which you want to remove entries for its End of year " "entries journal" -msgstr "Válassza ki az üzleti évet, amelynek a nyitó tételeit törölni akarja" +msgstr "" +"Válassza ki az üzleti évet, amelynek a záró tételei közül törölni szeretne" #. module: account #: field:account.tax.template,type_tax_use:0 @@ -8397,7 +8430,7 @@ msgstr "Gyűjtőkód karton" #. module: account #: view:account.config.settings:0 msgid "No Fiscal Year Defined for This Company" -msgstr "" +msgstr "Ehhez a vállalkozáshoz nem lett üzleti adóügyi év meghatározva" #. module: account #: view:account.invoice:0 @@ -8548,6 +8581,9 @@ msgid "" "This wizard will remove the end of year journal entries of selected fiscal " "year. Note that you can run this wizard many times for the same fiscal year." msgstr "" +"Ez a varázsló a kiválasztott üzleti adóügyi évet lezáró könyvelési napló " +"tételeit fogja eltávolítani. Megjegyezzük, hogy ezt a varázslót többször is " +"elindíthatja ugyanarra az üzleti évre." #. module: account #: report:account.invoice:0 @@ -8732,7 +8768,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close_state msgid "Fiscalyear Close state" -msgstr "Üzleti év zárása" +msgstr "Üzleti év zárt állapotban" #. module: account #: field:account.invoice.refund,journal_id:0 @@ -9161,7 +9197,7 @@ msgstr "" #. module: account #: field:account.config.settings,has_fiscal_year:0 msgid "Company has a fiscal year" -msgstr "" +msgstr "Vállalkozásnak van üzleti, adóügyi éve" #. module: account #: help:account.tax,child_depend:0 @@ -9599,6 +9635,9 @@ msgid "" "The period is invalid. Either some periods are overlapping or the period's " "dates are not matching the scope of the fiscal year." msgstr "" +"Hiba!\n" +"Az időszak nem érvényes. Vagy az egyes időszakok átfedik egymást vagy az " +"időszakok nem egyeznek az üzleti év határidőivel." #. module: account #: report:account.overdue:0 @@ -9897,7 +9936,7 @@ msgstr "Gyűjtőkódokból" #. module: account #: view:account.installer:0 msgid "Configure your Fiscal Year" -msgstr "" +msgstr "Állítsa be az üzleti, adóügyi évét" #. module: account #: field:account.period,name:0 @@ -10834,6 +10873,8 @@ msgstr "Könyvelési tételsorok jóváhagyása" msgid "" "The fiscal position will determine taxes and accounts used for the partner." msgstr "" +"Az ÁFA pozíció meghatározza a partnerre vonatkozó adókat és főkönyvi " +"számlákat." #. module: account #: model:process.node,note:account.process_node_supplierpaidinvoice0 @@ -10906,7 +10947,7 @@ msgstr "" #: view:ir.sequence:0 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear msgid "Fiscal Years" -msgstr "Üzleti év" +msgstr "Üzleti évek" #. module: account #: help:account.analytic.journal,active:0 diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index 55362cf55a0..f6ab25cbc72 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-08-21 06:06+0000\n" -"Last-Translator: Boyce Huang \n" +"PO-Revision-Date: 2013-12-01 17:16+0000\n" +"Last-Translator: Andy Cheng \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: 2013-09-12 05:37+0000\n" -"X-Generator: Launchpad (build 16761)\n" +"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n" +"X-Generator: Launchpad (build 16856)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -32,12 +32,12 @@ msgstr "在相同會計科目中，只能設定一次科目財務狀況。" msgid "" "Determine the display order in the report 'Accounting \\ Reporting \\ " "Generic Reporting \\ Taxes \\ Taxes Report'" -msgstr "確定以下報表的顯示順序：」會計-報表-通用報表-稅-稅報表「" +msgstr "確定以下報表的顯示順序：「會計 \\ 報表 \\ 通用報表 \\ 稅 \\ 稅報表」" #. module: account #: view:account.move.reconcile:0 msgid "Journal Entry Reconcile" -msgstr "日記帳分錄調節" +msgstr "帳簿分錄調節" #. module: account #: view:account.account:0 diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 3582221df44..6914adfaf20 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -295,7 +295,7 @@ - Total: + Total: [[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 09df82e38fd..bf28e900378 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -22,13 +22,12 @@ import time import datetime from dateutil.relativedelta import relativedelta -from operator import itemgetter -from os.path import join as opj +import openerp +from openerp import SUPERUSER_ID from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF from openerp.tools.translate import _ from openerp.osv import fields, osv -from openerp import tools class account_config_settings(osv.osv_memory): _name = 'account.config.settings' @@ -276,11 +275,13 @@ class account_config_settings(osv.osv_memory): def set_default_taxes(self, cr, uid, ids, context=None): """ set default sale and purchase taxes for products """ + if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager'): + raise openerp.exceptions.AccessError(_("Only administrators can change the settings")) ir_values = self.pool.get('ir.values') config = self.browse(cr, uid, ids[0], context) - ir_values.set_default(cr, uid, 'product.product', 'taxes_id', + ir_values.set_default(cr, SUPERUSER_ID, 'product.product', 'taxes_id', config.default_sale_tax and [config.default_sale_tax.id] or False, company_id=config.company_id.id) - ir_values.set_default(cr, uid, 'product.product', 'supplier_taxes_id', + ir_values.set_default(cr, SUPERUSER_ID, 'product.product', 'supplier_taxes_id', config.default_purchase_tax and [config.default_purchase_tax.id] or False, company_id=config.company_id.id) def set_chart_of_accounts(self, cr, uid, ids, context=None): diff --git a/addons/account_voucher/i18n/fi.po b/addons/account_voucher/i18n/fi.po new file mode 100644 index 00000000000..b3542ed0ab6 --- /dev/null +++ b/addons/account_voucher/i18n/fi.po @@ -0,0 +1,1283 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:04+0000\n" +"PO-Revision-Date: 2013-12-01 22:00+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n" +"X-Generator: Launchpad (build 16856)\n" + +#. module: account_voucher +#: field:account.bank.statement.line,voucher_id:0 +msgid "Reconciliation" +msgstr "Täsmäytys" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_account_config_settings +msgid "account.config.settings" +msgstr "account.config.settings" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:417 +#, python-format +msgid "Write-Off" +msgstr "Alaskirjaus" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Payment Ref" +msgstr "Maksuviite" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Total Amount" +msgstr "Kokonaisarvo" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Open Customer Journal Entries" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: view:sale.receipt.report:0 +msgid "Group By..." +msgstr "Ryhmittely..." + +#. module: account_voucher +#: help:account.voucher,writeoff_amount:0 +msgid "" +"Computed as the difference between the amount stated in the voucher and the " +"sum of allocation on the voucher lines." +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "(Update)" +msgstr "(Päivitys)" + +#. module: account_voucher +#: view:account.voucher:0 +#: model:ir.actions.act_window,name:account_voucher.act_pay_bills +msgid "Bill Payment" +msgstr "" + +#. module: account_voucher +#: view:account.statement.from.invoice.lines:0 +#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines +msgid "Import Entries" +msgstr "Tuo kirjaukset" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Voucher Entry" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "March" +msgstr "Maaliskuu" + +#. module: account_voucher +#: field:account.voucher,message_unread:0 +msgid "Unread Messages" +msgstr "Lukemattomia viestejä" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Pay Bill" +msgstr "Maksa lasku" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Are you sure you want to cancel this receipt?" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Set to Draft" +msgstr "Aseta ehdotukseksi" + +#. module: account_voucher +#: help:account.voucher,reference:0 +msgid "Transaction reference number." +msgstr "Tapahtuman referenssinumero" + +#. module: account_voucher +#: view:sale.receipt.report:0 +msgid "Group by year of Invoice Date" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,user_id:0 +msgid "Salesperson" +msgstr "Myyjä" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Voucher Statistics" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1641 +#, python-format +msgid "" +"You can not change the journal as you already reconciled some statement " +"lines!" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Validate" +msgstr "Vahvista" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment +#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment +msgid "Supplier Payments" +msgstr "Ostot" + +#. module: account_voucher +#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt +msgid "" +"

\n" +" Click to register a purchase receipt. \n" +"

\n" +" When the purchase receipt is confirmed, you can record the\n" +" supplier payment related to this purchase receipt.\n" +"

\n" +" " +msgstr "" +"

\n" +" Klikkaa rekisteröidäksesi ostokuitin.\n" +"

\n" +" Kun ostokuitti on vahvistettu, voit kirjata toimittajalle\n" +" tähän ostokuittiin liittyvän maksun.\n" +"

\n" +" " + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Search Vouchers" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,writeoff_acc_id:0 +msgid "Counterpart Account" +msgstr "Vastatili" + +#. module: account_voucher +#: field:account.voucher,account_id:0 +#: field:account.voucher.line,account_id:0 +#: field:sale.receipt.report,account_id:0 +msgid "Account" +msgstr "Tili" + +#. module: account_voucher +#: field:account.voucher,line_dr_ids:0 +msgid "Debits" +msgstr "" + +#. module: account_voucher +#: view:account.statement.from.invoice.lines:0 +msgid "Ok" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.line,reconcile:0 +msgid "Full Reconcile" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,date_due:0 +#: field:account.voucher.line,date_due:0 +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,date_due:0 +msgid "Due Date" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,narration:0 +msgid "Notes" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt +#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt +msgid "Purchase Receipts" +msgstr "Ostokuitit" + +#. module: account_voucher +#: field:account.voucher.line,move_line_id:0 +msgid "Journal Item" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:558 +#: code:addons/account_voucher/account_voucher.py:1073 +#, python-format +msgid "Error!" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.line,amount:0 +msgid "Amount" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Payment Options" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Other Information" +msgstr "" + +#. module: account_voucher +#: selection:account.voucher,state:0 +#: selection:sale.receipt.report,state:0 +msgid "Cancelled" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1249 +#, python-format +msgid "" +"You have to configure account base code and account tax code on the '%s' tax!" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt +msgid "" +"

\n" +" Click to create a sale receipt.\n" +"

\n" +" When the sale receipt is confirmed, you can record the " +"customer\n" +" payment related to this sales receipt.\n" +"

\n" +" " +msgstr "" +"

\n" +" Klikkaa luodaksesi myyntikuitin.\n" +"

\n" +" Kun myyntikuitti on vahvistettu, voit kirjata asiakkaan\n" +" tähän kuittin littyvän suorituksen.\n" +"

\n" +" " + +#. module: account_voucher +#: help:account.voucher,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,day:0 +msgid "Day" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,tax_id:0 +msgid "Tax" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:971 +#, python-format +msgid "Invalid Action!" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,comment:0 +msgid "Counterpart Comment" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.line,account_analytic_id:0 +msgid "Analytic Account" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,message_summary:0 +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Total Allocation" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Payment Information" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "(update)" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: selection:account.voucher,state:0 +#: view:sale.receipt.report:0 +#: selection:sale.receipt.report,state:0 +msgid "Draft" +msgstr "" + +#. module: account_voucher +#: view:account.bank.statement:0 +msgid "Import Invoices" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1208 +#, python-format +msgid "Wrong voucher line" +msgstr "" + +#. module: account_voucher +#: selection:account.voucher,pay_now:0 +#: selection:sale.receipt.report,pay_now:0 +msgid "Pay Later or Group Funds" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: selection:account.voucher,type:0 +#: selection:sale.receipt.report,type:0 +msgid "Receipt" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1110 +#, python-format +msgid "" +"You should configure the 'Gain Exchange Rate Account' in the accounting " +"settings, to manage automatically the booking of accounting entries related " +"to differences between exchange rates." +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Sales Lines" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,period_id:0 +msgid "Period" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: code:addons/account_voucher/account_voucher.py:231 +#, python-format +msgid "Supplier" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Supplier Voucher" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: account_voucher +#: selection:account.voucher.line,type:0 +msgid "Debit" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1641 +#, python-format +msgid "Unable to change journal !" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,nbr:0 +msgid "# of Voucher Lines" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,type:0 +msgid "Type" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +msgid "Pro-forma Vouchers" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open +msgid "Voucher Entries" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment +msgid "" +"

\n" +" Click to create a new supplier payment.\n" +"

\n" +" OpenERP helps you easily track payments you make and the " +"remaining balances you need to pay your suppliers.\n" +"

\n" +" " +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Open Supplier Journal Entries" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list +msgid "Vouchers Entries" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,name:0 +msgid "Memo" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Are you sure to unreconcile and cancel this record ?" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,is_multi_currency:0 +msgid "Multi Currency Voucher" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Bill Information" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "July" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,state:0 +msgid "" +" * The 'Draft' status is used when a user is encoding a new and unconfirmed " +"Voucher. \n" +"* The 'Pro-forma' when voucher is in Pro-forma status,voucher does not have " +"an voucher number. \n" +"* The 'Posted' status is used when user create voucher,a voucher number is " +"generated and voucher entries are created in account " +"\n" +"* The 'Cancelled' status is used when user cancel voucher." +msgstr "" + +#. module: account_voucher +#: field:account.voucher,writeoff_amount:0 +msgid "Difference Amount" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,due_delay:0 +msgid "Avg. Due Delay" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/invoice.py:34 +#, python-format +msgid "Pay Invoice" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1249 +#, python-format +msgid "No Account Base Code and Account Tax Code!" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,tax_amount:0 +msgid "Tax Amount" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +msgid "Validated Vouchers" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt +msgid "" +"

\n" +" Click to register a new payment. \n" +"

\n" +" Enter the customer and the payment method and then, either\n" +" create manually a payment record or OpenERP will propose to " +"you\n" +" automatically the reconciliation of this payment with the " +"open\n" +" invoices or sales receipts.\n" +"

\n" +" " +msgstr "" +"

\n" +" Klikkaa rekisteröidäksesi uuden maksusuorituksen.\n" +"

\n" +" Anna asikas ja maksumenetelmä ja sen jälkeen, joko luo \n" +" manauaalisesti maksutietue tai OpenERP ehdottaa sinulle \n" +" automaattisesti tämän maksun täsmäytystä avoimien laskujen \n" +" tai myyntikuittien kanssa.\n" +"

\n" +" " + +#. module: account_voucher +#: field:account.config.settings,expense_currency_exchange_account_id:0 +#: field:res.company,expense_currency_exchange_account_id:0 +msgid "Loss Exchange Rate Account" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Paid Amount" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,payment_option:0 +msgid "Payment Difference" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,audit:0 +msgid "To Review" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1120 +#: code:addons/account_voucher/account_voucher.py:1134 +#: code:addons/account_voucher/account_voucher.py:1286 +#, python-format +msgid "change" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1106 +#, python-format +msgid "" +"You should configure the 'Loss Exchange Rate Account' in the accounting " +"settings, to manage automatically the booking of accounting entries related " +"to differences between exchange rates." +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Expense Lines" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Sale voucher" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,is_multi_currency:0 +msgid "" +"Fields with internal purpose only that depicts if the voucher is a multi " +"currency one or not" +msgstr "" + +#. module: account_voucher +#: view:account.invoice:0 +msgid "Register Payment" +msgstr "" + +#. module: account_voucher +#: field:account.statement.from.invoice.lines,line_ids:0 +msgid "Invoices" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "December" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +msgid "Group by month of Invoice Date" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,month:0 +msgid "Month" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,currency_id:0 +#: field:account.voucher.line,currency_id:0 +#: model:ir.model,name:account_voucher.model_res_currency +#: field:sale.receipt.report,currency_id:0 +msgid "Currency" +msgstr "" + +#. module: account_voucher +#: view:account.statement.from.invoice.lines:0 +msgid "Payable and Receivables" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Voucher Payment" +msgstr "" + +#. module: account_voucher +#: field:sale.receipt.report,state:0 +msgid "Voucher Status" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Are you sure to unreconcile this record?" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,company_id:0 +#: field:account.voucher.line,company_id:0 +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,company_id:0 +msgid "Company" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,paid:0 +msgid "The Voucher has been totally paid." +msgstr "" + +#. module: account_voucher +#: selection:account.voucher,payment_option:0 +msgid "Reconcile Payment Balance" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1067 +#, python-format +msgid "Configuration Error !" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: view:sale.receipt.report:0 +msgid "Draft Vouchers" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,price_total_tax:0 +msgid "Total With Tax" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Purchase Voucher" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,state:0 +#: view:sale.receipt.report:0 +msgid "Status" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Allocation" +msgstr "" + +#. module: account_voucher +#: view:account.statement.from.invoice.lines:0 +#: view:account.voucher:0 +msgid "or" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "August" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Validate Payment" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,audit:0 +msgid "" +"Check this box if you are unsure of that journal entry and if you want to " +"note it as 'to be reviewed' by an accounting expert." +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "October" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1068 +#, python-format +msgid "Please activate the sequence of selected journal !" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "June" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,payment_rate_currency_id:0 +msgid "Payment Rate Currency" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,paid:0 +msgid "Paid" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt +#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt +msgid "Sales Receipts" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,analytic_id:0 +msgid "Write-Off Analytic Account" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,date:0 +#: field:account.voucher.line,date_original:0 +#: field:sale.receipt.report,date:0 +msgid "Date" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "November" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: account_voucher +#: field:account.voucher,paid_amount_in_company_currency:0 +msgid "Paid Amount in Company Currency" +msgstr "" + +#. module: account_voucher +#: field:account.bank.statement.line,amount_reconciled:0 +msgid "Amount reconciled" +msgstr "" + +#. module: account_voucher +#: selection:account.voucher,pay_now:0 +#: selection:sale.receipt.report,pay_now:0 +msgid "Pay Directly" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.line,type:0 +msgid "Dr/Cr" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,pre_line:0 +msgid "Previous Payments ?" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1208 +#, python-format +msgid "The invoice you are willing to pay is not valid anymore." +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "January" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_voucher_list +#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher +msgid "Journal Vouchers" +msgstr "" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_res_company +msgid "Companies" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,active:0 +msgid "Active" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1074 +#, python-format +msgid "Please define a sequence on the journal." +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher +#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt +#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt +msgid "Customer Payments" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all +#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all +#: view:sale.receipt.report:0 +msgid "Sales Receipts Analysis" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +msgid "Group by Invoice Date" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Post" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Invoices and outstanding transactions" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,price_total:0 +msgid "Total Without Tax" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Bill Date" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Unreconcile" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: model:ir.model,name:account_voucher.model_account_voucher +msgid "Accounting Voucher" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,number:0 +msgid "Number" +msgstr "" + +#. module: account_voucher +#: selection:account.voucher.line,type:0 +msgid "Credit" +msgstr "" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_account_bank_statement +msgid "Bank Statement" +msgstr "" + +#. module: account_voucher +#: view:account.bank.statement:0 +msgid "onchange_amount(amount)" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "September" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Sales Information" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher.line,voucher_id:0 +#: model:res.request.link,name:account_voucher.req_link_voucher +msgid "Voucher" +msgstr "" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Voucher Items" +msgstr "" + +#. module: account_voucher +#: view:account.statement.from.invoice.lines:0 +#: view:account.voucher:0 +msgid "Cancel" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.client,name:account_voucher.action_client_invoice_menu +msgid "Open Invoicing Menu" +msgstr "" + +#. module: account_voucher +#: selection:account.voucher,state:0 +#: view:sale.receipt.report:0 +#: selection:sale.receipt.report,state:0 +msgid "Pro-forma" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,move_ids:0 +msgid "Journal Items" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:558 +#, python-format +msgid "Please define default credit/debit accounts on the journal \"%s\"." +msgstr "" + +#. module: account_voucher +#: selection:account.voucher,type:0 +#: selection:sale.receipt.report,type:0 +msgid "Purchase" +msgstr "" + +#. module: account_voucher +#: view:account.invoice:0 +#: view:account.voucher:0 +msgid "Pay" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Currency Options" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,payment_option:0 +msgid "" +"This field helps you to choose what you want to do with the eventual " +"difference between the paid amount and the sum of allocated amounts. You can " +"either choose to keep open this difference on the partner's account, or " +"reconcile it with the payment(s)" +msgstr "" + +#. module: account_voucher +#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all +msgid "" +"

\n" +" From this report, you can have an overview of the amount " +"invoiced\n" +" to your customer as well as payment delays. The tool search can\n" +" also be used to personalise your Invoices reports and so, match\n" +" this analysis to your needs.\n" +"

\n" +" " +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Posted Vouchers" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,payment_rate:0 +msgid "Exchange Rate" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Payment Method" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.line,name:0 +msgid "Description" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "May" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Sale Receipt" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,journal_id:0 +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Internal Notes" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,line_cr_ids:0 +msgid "Credits" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.line,amount_original:0 +msgid "Original Amount" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Purchase Receipt" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,payment_rate:0 +msgid "" +"The specific rate that will be used, in this voucher, between the selected " +"currency (in 'Payment Rate Currency' field) and the voucher currency." +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,pay_now:0 +#: selection:account.voucher,type:0 +#: field:sale.receipt.report,pay_now:0 +#: selection:sale.receipt.report,type:0 +msgid "Payment" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: selection:account.voucher,state:0 +#: view:sale.receipt.report:0 +#: selection:sale.receipt.report,state:0 +msgid "Posted" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Customer" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "February" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Supplier Invoices and Outstanding transactions" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,reference:0 +msgid "Ref #" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,year:0 +msgid "Year" +msgstr "" + +#. module: account_voucher +#: field:account.config.settings,income_currency_exchange_account_id:0 +#: field:res.company,income_currency_exchange_account_id:0 +msgid "Gain Exchange Rate Account" +msgstr "" + +#. module: account_voucher +#: selection:account.voucher,type:0 +#: selection:sale.receipt.report,type:0 +msgid "Sale" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "April" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,tax_id:0 +msgid "Only for tax excluded from price" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,type:0 +msgid "Default Type" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines +msgid "Entries by Statement from Invoices" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,amount:0 +msgid "Total" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,move_id:0 +msgid "Account Entry" +msgstr "" + +#. module: account_voucher +#: constraint:account.bank.statement.line:0 +msgid "" +"The amount of the voucher must be the same amount as the one on the " +"statement line." +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:971 +#, python-format +msgid "Cannot delete voucher(s) which are already opened or paid." +msgstr "" + +#. module: account_voucher +#: help:account.voucher,date:0 +msgid "Effective date for accounting entries" +msgstr "" + +#. module: account_voucher +#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change +msgid "Status Change" +msgstr "" + +#. module: account_voucher +#: selection:account.voucher,payment_option:0 +msgid "Keep Open" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,line_ids:0 +#: view:account.voucher.line:0 +#: model:ir.model,name:account_voucher.model_account_voucher_line +msgid "Voucher Lines" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,delay_to_pay:0 +msgid "Avg. Delay To Pay" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.line,untax_amount:0 +msgid "Untax Amount" +msgstr "" + +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_sale_receipt_report +msgid "Sales Receipt Statistics" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +#: field:account.voucher,partner_id:0 +#: field:account.voucher.line,partner_id:0 +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.line,amount_unreconciled:0 +msgid "Open Balance" +msgstr "" + +#. module: account_voucher +#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change +msgid "Status changed" +msgstr "" + +#. module: account_voucher +#: code:addons/account_voucher/account_voucher.py:1106 +#: code:addons/account_voucher/account_voucher.py:1110 +#, python-format +msgid "Insufficient Configuration!" +msgstr "" + +#. module: account_voucher +#: help:account.voucher,active:0 +msgid "" +"By default, reconciliation vouchers made on draft bank statements are set as " +"inactive, which allow to hide the customer/supplier payment while the bank " +"statement isn't confirmed." +msgstr "" diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml index 65ada8f39db..f153f03237d 100644 --- a/addons/auth_signup/auth_signup_data.xml +++ b/addons/auth_signup/auth_signup_data.xml @@ -11,6 +11,8 @@ + + _usertemplate diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 9396c89e776..769d4e2b358 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -424,12 +424,8 @@ property or property parameter."), event.add('location').value = event_obj.location if event_obj.rrule: event.add('rrule').value = event_obj.rrule - if event_obj.organizer: - # deprecated: will be removed with OpenERP v8: use organizer_id instead - event_org = event.add('organizer') - event_org.params['CN'] = [event_obj.organizer] - event_org.value = 'MAILTO:' + (event_obj.organizer) - elif event_obj.user_id or event_obj.organizer_id: + + if event_obj.user_id or event_obj.organizer_id: event_org = event.add('organizer') organizer = event_obj.organizer_id if not organizer: diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css index 3913619b6c9..579b6e26999 100644 --- a/addons/base_import/static/src/css/import.css +++ b/addons/base_import/static/src/css/import.css @@ -1,12 +1,14 @@ .oe_import > p { margin-left: 8px; margin-right: 8px; + margin-top: 13px; /* Customize space according bootstrap3 */ text-align: justify } .oe_import h2 { margin-top: 0; margin-bottom: 5px; + font-size: 1.5em; /* Customize according bootstrap3 */ } .oe_padding { @@ -22,6 +24,14 @@ border: solid 1px #dddddd; width: 600px; } +/* Customize according bootstrap3 */ +.oe_import .oe_import_box label{ + font-weight: normal; +} +.oe_import .oe_import_box .oe_import_file { + display: inline-block; +} +/* End of Customize */ .oe_import .oe_import_toggle{ margin-top: 8px; } @@ -40,7 +50,7 @@ } .oe_import .oe_import_options p { - margin: 0; + margin: 0 0 -7px 0; /* Customize margin-bottom of

according bootstrap3 */ padding: 0; } .oe_import .oe_import_options label { @@ -69,6 +79,14 @@ .oe_import .oe_import_report_more { display: none; } +/* Customize dd and label according bootstrap3 */ +.oe_import dd { + -webkit-margin-start: 40px; +} +.oe_import .oe_import_with_file label { + font-weight: normal; +} +/* End of customize */ .oe_import.oe_import_preview .oe_import_grid { display: table; diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js index 0c3acd98265..1238bc9570f 100644 --- a/addons/base_import/static/src/js/import.js +++ b/addons/base_import/static/src/js/import.js @@ -373,7 +373,7 @@ openerp.base_import = function (instance) { return $.when([{ type: 'error', record: false, - message: error.data.fault_code, + message: error.data.arguments[1], }]); }) ; }, diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 36a7e91c3b9..1fcd7311a79 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -99,6 +99,7 @@ help="Convert to Opportunity" class="oe_highlight"/> @@ -379,14 +380,11 @@

- -
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css index ba4473edc26..cce8248bc8b 100644 --- a/addons/crm/static/src/css/crm.css +++ b/addons/crm/static/src/css/crm.css @@ -1,5 +1,8 @@ .openerp .oe_kanban_view .oe_kanban_crm_salesteams { - width: 345px; + /* Customize width and height of kanban according bootstrap3 */ + width: 357px; + min-height: 254px !important; + /* End of customize */ } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_avatars { text-align: right; @@ -21,7 +24,7 @@ .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list { position: relative; - margin: 10px; + margin: 10px 0 10px 9px; /* Improved margin to set alignment of list items according bootstrap3 */ } .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div { width: 160px; diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index f239ad739c1..8ce2aa1c6c7 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -38,6 +38,9 @@ class crm_lead2opportunity_partner(osv.osv_memory): 'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True), } + def onchange_action(self, cr, uid, ids, action, context=None): + return {'value': {'partner_id': False if action != 'exist' else self._find_matching_partner(cr, uid, context=context)}} + def default_get(self, cr, uid, fields, context=None): """ Default get for name, opportunity_ids. diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml index 4f6522c27de..09506c3ed81 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml +++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml @@ -31,7 +31,7 @@ - + diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 2d0787ca527..965c4b5bffc 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -51,7 +51,9 @@ - + + diff --git a/addons/document/document.py b/addons/document/document.py index 91af97246b8..5fc62578b1d 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -69,7 +69,11 @@ class document_file(osv.osv): def check(self, cr, uid, ids, mode, context=None, values=None): """Overwrite check to verify access on directory to validate specifications of doc/access_permissions.rst""" + if not isinstance(ids, list): + ids = [ids] + super(document_file, self).check(cr, uid, ids, mode, context=context, values=values) + if ids: self.pool.get('ir.model.access').check(cr, uid, 'document.directory', mode) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index efa1387435a..6e19b1eb8aa 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -369,7 +369,7 @@ class email_template(osv.osv): attachment_ids=[attach.id for attach in template.attachment_ids], ) - # Add report in attachments + # Add report in attachments: generate once for all template_res_ids if template.report_template: for res_id in template_res_ids: attachments = [] @@ -387,8 +387,7 @@ class email_template(osv.osv): if not report_name.endswith(ext): report_name += ext attachments.append((report_name, result)) - - values['attachments'] = attachments + results[res_id]['attachments'] = attachments return results diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py index df0d6a3c5af..b69c7ddd173 100644 --- a/addons/google_drive/google_drive.py +++ b/addons/google_drive/google_drive.py @@ -60,10 +60,9 @@ class config(osv.Model): def get_access_token(self, cr, uid, scope=None, context=None): ir_config = self.pool['ir.config_parameter'] google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token') - group_config = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_erp_manager')[1] - user = self.pool['res.users'].read(cr, uid, uid, "groups_id") + user_is_admin = self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager') if not google_drive_refresh_token: - if group_config in user['groups_id']: + if user_is_admin: raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context) else: raise osv.except_osv(_('Error!'), _("Google Drive is not yet configured. Please contact your administrator.")) @@ -81,7 +80,7 @@ class config(osv.Model): req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers) content = urllib2.urlopen(req).read() except urllib2.HTTPError: - if group_config in user['groups_id']: + if user_is_admin: raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during the token generation. Please request again an authorization code in %(menu:base_setup.menu_general_configuration)s."), context=context) else: raise osv.except_osv(_('Error!'), _("Google Drive is not yet configured. Please contact your administrator.")) diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py index a724e3c425e..81ec536b6f2 100644 --- a/addons/google_spreadsheet/google_spreadsheet.py +++ b/addons/google_spreadsheet/google_spreadsheet.py @@ -18,6 +18,7 @@ # ############################################################################## +import cgi import simplejson import logging from lxml import etree @@ -67,24 +68,24 @@ class config(osv.osv): request = ''' - https://spreadsheets.google.com/feeds/cells/%s/od6/private/full + https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full A1 - https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R1C1 + https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full/R1C1 - + href="https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full/R1C1"/> + A2 - https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R60C15 + https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full/R60C15 - + href="https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full/R60C15"/> + -''' % (spreadsheet_key, spreadsheet_key, spreadsheet_key, formula.replace('"', '"'), spreadsheet_key, spreadsheet_key, config_formula.replace('"', '"')) +''' .format(key=spreadsheet_key, formula=cgi.escape(formula, quote=True), config=cgi.escape(config_formula, quote=True)) try: req = urllib2.Request( diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css index 664d4f96e41..849cd33a894 100644 --- a/addons/hr_attendance/static/src/css/slider.css +++ b/addons/hr_attendance/static/src/css/slider.css @@ -5,7 +5,7 @@ display: inline-block; } .openerp .oe_attendance_signin { - float:left; + float: right; height: 32px; width: 32px; background: url(/hr_attendance/static/src/img/emp-out32.png); diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css index 5fd92fc9f42..99a63002326 100644 --- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css +++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css @@ -19,7 +19,7 @@ text-align: center; color: #006699; font-family: "Helvetica Neue", Arial, Verdana, "Nimbus Sans L", sans-serif; - font-size: 10px; + font-size: 11px; background: #eeeeee; min-width: 47px; } diff --git a/addons/idea/static/src/css/idea_idea.css b/addons/idea/static/src/css/idea_idea.css index 08daffd902a..ff146bd189d 100644 --- a/addons/idea/static/src/css/idea_idea.css +++ b/addons/idea/static/src/css/idea_idea.css @@ -1,5 +1,5 @@ .openerp .oe_kanban_view .oe_kanban_idea_idea { - width: 200px; + width: 212px; /* Customize width according bootstrap3 */ } .openerp .oe_kanban_view .oe_kanban_idea_idea .oe_avatars { diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js index f4b74adebf6..aa2e7d963b6 100644 --- a/addons/im/static/src/js/im.js +++ b/addons/im/static/src/js/im.js @@ -80,7 +80,7 @@ }); }, calc_box: function() { - var $topbar = instance.client.$(".oe_topbar"); + var $topbar = instance.client.$(".navbar"); // .oe_topbar is replaced with .navbar of bootstrap3 var top = $topbar.offset().top + $topbar.height(); top = Math.max(top - $(window).scrollTop(), 0); this.$el.css("top", top); diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py index b21a31d8362..e322467e64e 100644 --- a/addons/im_livechat/im_livechat.py +++ b/addons/im_livechat/im_livechat.py @@ -211,5 +211,5 @@ class im_session(osv.osv): _inherit = 'im.session' _columns = { - 'channel_id': fields.many2one("im.user", "Channel"), + 'channel_id': fields.many2one("im_livechat.channel", "Channel"), } diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po index b03ef6d9b0d..9b376093a29 100644 --- a/addons/mail/i18n/hu.po +++ b/addons/mail/i18n/hu.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2013-02-14 16:43+0000\n" +"PO-Revision-Date: 2013-12-02 18:38+0000\n" "Last-Translator: krnkris \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: 2013-09-12 06:29+0000\n" -"X-Generator: Launchpad (build 16761)\n" +"X-Launchpad-Export-Date: 2013-12-03 05:41+0000\n" +"X-Generator: Launchpad (build 16856)\n" #. module: mail #: view:mail.followers:0 @@ -1791,7 +1791,7 @@ msgstr "Altípusok" #. module: mail #: model:ir.model,name:mail.model_mail_alias msgid "Email Aliases" -msgstr "e-amil álnevek" +msgstr "Email álnevek" #. module: mail #: field:mail.group,image_small:0 diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 4bd0ff4a94e..f69cbdbefc0 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -1122,7 +1122,7 @@ class mail_thread(osv.AbstractModel): encoding = part.get_content_charset() # None if attachment # 1) Explicit Attachments -> attachments if filename or part.get('content-disposition', '').strip().startswith('attachment'): - attachments.append((filename or 'attachment', part.get_payload(decode=True))) + attachments.append((decode(filename) or 'attachment', part.get_payload(decode=True))) continue # 2) text/plain -> 
                 if part.get_content_type() == 'text/plain' and (not alternative or not body):
@@ -1347,6 +1347,40 @@ class mail_thread(osv.AbstractModel):
                     mail_message_obj.write(cr, SUPERUSER_ID, message_ids, {'author_id': partner_info['partner_id']}, context=context)
         return result
 
+    def _message_preprocess_attachments(self, cr, uid, attachments, attachment_ids, attach_model, attach_res_id, context=None):
+        """ Preprocess attachments for mail_thread.message_post() or mail_mail.create().
+
+        :param list attachments: list of attachment tuples in the form ``(name,content)``,
+                                 where content is NOT base64 encoded
+        :param list attachment_ids: a list of attachment ids, not in tomany command form
+        :param str attach_model: the model of the attachments parent record
+        :param integer attach_res_id: the id of the attachments parent record
+        """
+        Attachment = self.pool['ir.attachment']
+        m2m_attachment_ids = []
+        if attachment_ids:
+            filtered_attachment_ids = Attachment.search(cr, SUPERUSER_ID, [
+                ('res_model', '=', 'mail.compose.message'),
+                ('create_uid', '=', uid),
+                ('id', 'in', attachment_ids)], context=context)
+            if filtered_attachment_ids:
+                Attachment.write(cr, SUPERUSER_ID, filtered_attachment_ids, {'res_model': attach_model, 'res_id': attach_res_id}, context=context)
+            m2m_attachment_ids += [(4, id) for id in attachment_ids]
+        # Handle attachments parameter, that is a dictionary of attachments
+        for name, content in attachments:
+            if isinstance(content, unicode):
+                content = content.encode('utf-8')
+            data_attach = {
+                'name': name,
+                'datas': base64.b64encode(str(content)),
+                'datas_fname': name,
+                'description': name,
+                'res_model': attach_model,
+                'res_id': attach_res_id,
+            }
+            m2m_attachment_ids.append((0, 0, data_attach))
+        return m2m_attachment_ids
+
     def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
                      subtype=None, parent_id=False, attachments=None, context=None,
                      content_subtype='html', **kwargs):
@@ -1425,28 +1459,7 @@ class mail_thread(osv.AbstractModel):
 
         # 3. Attachments
         #   - HACK TDE FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
-        attachment_ids = kwargs.pop('attachment_ids', []) or []  # because we could receive None (some old code sends None)
-        if attachment_ids:
-            filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [
-                ('res_model', '=', 'mail.compose.message'),
-                ('create_uid', '=', uid),
-                ('id', 'in', attachment_ids)], context=context)
-            if filtered_attachment_ids:
-                ir_attachment.write(cr, SUPERUSER_ID, filtered_attachment_ids, {'res_model': model, 'res_id': thread_id}, context=context)
-        attachment_ids = [(4, id) for id in attachment_ids]
-        # Handle attachments parameter, that is a dictionary of attachments
-        for name, content in attachments:
-            if isinstance(content, unicode):
-                content = content.encode('utf-8')
-            data_attach = {
-                'name': name,
-                'datas': base64.b64encode(str(content)),
-                'datas_fname': name,
-                'description': name,
-                'res_model': model,
-                'res_id': thread_id,
-            }
-            attachment_ids.append((0, 0, data_attach))
+        attachment_ids = self._message_preprocess_attachments(cr, uid, attachments, kwargs.pop('attachment_ids', []), model, thread_id, context)
 
         # 4: mail.message.subtype
         subtype_id = False
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index ac1d406c29a..e335929ec2f 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -81,6 +81,12 @@ class res_users(osv.Model):
         self._create_welcome_message(cr, uid, user, context=context)
         return user_id
 
+    def copy_data(self, *args, **kwargs):
+        data = super(res_users, self).copy_data(*args, **kwargs)
+        if data.get('alias_name'):
+            data['alias_name'] = data['login']
+        return data
+
     def _create_welcome_message(self, cr, uid, user, context=None):
         if not self.has_group(cr, uid, 'base.group_user'):
             return False
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 53afbed7997..bfae7571a9c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -94,9 +94,7 @@
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
     margin-left: 4px;
-    padding-top: 3px;
     overflow: hidden;
-    margin-bottom: 4px;
     font-size: 11px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_content{
@@ -478,7 +476,7 @@
 }
 .openerp .oe_mail .oe_msg_footer button.oe_attach{
     width: 24px;
-    overflow: hidden;
+    margin-bottom: 5px; /* improved margin of file attach button according bootstrap3 */
     filter:none;
 }
 .openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{
@@ -634,7 +632,7 @@
     margin-bottom: 4px;
 }
 .openerp .oe_followers .oe_invite{
-    float: right;
+    padding-left: 5px;
 }
 .openerp .oe_followers .oe_partner {
     height: 32px;
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index f129e5bf0f9..833811c07a1 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,7 +19,9 @@
 #
 ##############################################################################
 
+import base64
 import re
+
 from openerp import tools
 from openerp import SUPERUSER_ID
 from openerp.osv import osv
@@ -260,6 +262,12 @@ class mail_compose_message(osv.TransientModel):
 
             for res_id, mail_values in all_mail_values.iteritems():
                 if mass_mail_mode and not wizard.post:
+                    m2m_attachment_ids = self.pool['mail.thread']._message_preprocess_attachments(
+                        cr, uid, mail_values.pop('attachments', []),
+                        mail_values.pop('attachment_ids', []),
+                        'mail.message', 0,
+                        context=context)
+                    mail_values['attachment_ids'] = m2m_attachment_ids
                     self.pool.get('mail.mail').create(cr, uid, mail_values, context=context)
                 else:
                     subtype = 'mail.mt_comment'
@@ -298,7 +306,12 @@ class mail_compose_message(osv.TransientModel):
             if mass_mail_mode and wizard.model:
                 email_dict = rendered_values[res_id]
                 mail_values['partner_ids'] += email_dict.pop('partner_ids', [])
-                mail_values['attachments'] = email_dict.pop('attachments', [])
+                # process attachments: should not be encoded before being processed by message_post / mail_mail create
+                attachments = []
+                if email_dict.get('attachments'):
+                    for name, enc_cont in email_dict.pop('attachments'):
+                        attachments.append((name, base64.b64decode(enc_cont)))
+                mail_values['attachments'] = attachments
                 attachment_ids = []
                 for attach_id in mail_values.pop('attachment_ids'):
                     new_attach_id = self.pool.get('ir.attachment').copy(cr, uid, attach_id, {'res_model': self._name, 'res_id': wizard.id}, context=context)
diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index ca5455d6323..e54ce46c025 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -1,13 +1,19 @@
 .openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_campaign {
-    width: 540px;
+    /* Customize to manage content */
+    width: 552px;
+    min-height: 278px !important;
+    /* End of customize */
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_segment {
-    width: 270px;
+    /* Customize to manage content */
+    width: 282px;
+    min-height: 246px !important;
+    /* End of customize */
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_stats {
-    width: 120px;
+    width: 122px; /* Manage space in between stats */
     display: inline-block;
     margin: 2px 5px 0px 5px;
     text-align: center;
diff --git a/addons/note/note.py b/addons/note/note.py
index 95fe8f97cdf..00c67c37191 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -147,6 +147,7 @@ class note_note(osv.osv):
                     if result and result[0]['stage_id'][0] == current_stage_ids[0]:
                         dom_in = result[0]['__domain'].pop()
                         result[0]['__domain'] = domain + ['|', dom_in, dom_not_in]
+                        result[0]['stage_id_count'] += nb_notes_ws
                     else:
                         # add the first stage column
                         result = [{
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index a0002ebe97c..facf15b28de 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -92,6 +92,7 @@
     font-family: arial, sans-serif;
     font-size: 15px;
     line-height: 19px; 
+    word-wrap: break-word;
 }
 
 .openerp .oe_form_nomargin .etherpad_readonly{ 
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 738d3fd9f4f..3a3a8f23231 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -126,6 +126,7 @@
     background: #393939;
     background: -moz-linear-gradient(#7b7979, #393939);
     background: -webkit-gradient(linear, left top, left bottom, from(#7b7979), to(#393939));
+    z-index: 2; /* Customize according bootstrap3 navbar */
 }
 
 /*  a) The left part of the top-bar */
@@ -659,6 +660,7 @@
 .point-of-sale .screen header h2 {
     margin-top: 0px;
     padding-top: 7px;
+    font-size: 1.5em /* Customize font according bootstrap3 */
 }
 .point-of-sale .screen p{
     font-size: 18px;
diff --git a/addons/portal/static/src/css/portal.css b/addons/portal/static/src/css/portal.css
index 45c0cdd7805..e32f3b0e639 100644
--- a/addons/portal/static/src/css/portal.css
+++ b/addons/portal/static/src/css/portal.css
@@ -10,7 +10,7 @@
     margin: -40px 0 -32px -24px;
     position: relative;
     padding: 10px 15px;
-    right: -153px;
+    right: -125px; /* improved margin according bootstrap3 */
      
     background: #729FCF;
 	background-image: -webkit-gradient(linear, left top, left bottom, from(#729FCF), to(#3465A4));
diff --git a/addons/portal_anonymous/i18n/fi.po b/addons/portal_anonymous/i18n/fi.po
new file mode 100644
index 00000000000..7aa99c2f05e
--- /dev/null
+++ b/addons/portal_anonymous/i18n/fi.po
@@ -0,0 +1,25 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-01 22:23+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n"
+"X-Generator: Launchpad (build 16856)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Kirjautuminen"
diff --git a/addons/portal_anonymous/static/src/js/portal_anonymous.js b/addons/portal_anonymous/static/src/js/portal_anonymous.js
index d4f6351efc9..f6b41eb59f0 100644
--- a/addons/portal_anonymous/static/src/js/portal_anonymous.js
+++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js
@@ -71,7 +71,7 @@ openerp.portal_anonymous = function(instance) {
             this.$el.find('a.login').click(function() {
                 var p = self.getParent();
                 var am = p.action_manager;
-                p.$el.find('.oe_leftbar, .oe_topbar').hide();
+                p.$el.find('.oe_leftbar, .navbar').hide(); // .oe_topbar is replaced with .navbar of bootstrap3 
                 self.session.session_logout().done(function () {
                     am.do_action({
                         type:'ir.actions.client',
diff --git a/addons/portal_claim/i18n/fi.po b/addons/portal_claim/i18n/fi.po
new file mode 100644
index 00000000000..fbad5bedaf0
--- /dev/null
+++ b/addons/portal_claim/i18n/fi.po
@@ -0,0 +1,36 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-01 22:24+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n"
+"X-Generator: Launchpad (build 16856)\n"
+
+#. module: portal_claim
+#: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
+msgid ""
+"
\n"
+"                Click to register a new claim. \n"
+"              
\n"
+"                You can track your claims from this menu and the action we\n"
+"                will take.\n"
+"              
\n"
+"            "
+msgstr ""
+
+#. module: portal_claim
+#: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims
+msgid "Claims"
+msgstr "Reklamaatiot"
diff --git a/addons/portal_crm/i18n/fi.po b/addons/portal_crm/i18n/fi.po
new file mode 100644
index 00000000000..ed8c3a72160
--- /dev/null
+++ b/addons/portal_crm/i18n/fi.po
@@ -0,0 +1,548 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-01 22:26+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n"
+"X-Generator: Launchpad (build 16856)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr "Liidi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr "Titteli"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr "Onnistumistodennäköisyys (%)"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr "Ota yhteyttä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr "Seuraava toimenpidepäivä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr "Faksi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr "Postinumero"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr "Lukemattomia viestejä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr "Korkein"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr "Matkapuhelin"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr "Muistiinpanot"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr "Väri-indeksi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr "Asiakkaan nimi"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Jos valittu, uudet viestit vaativat huomiosi."
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr "Kommunikointikanava (sähköposti, suora, puhelin,...)"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr "Kampanja"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr "Viite"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr "Seuraava toimenpide"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Sisältää viestien yhteenvedon (viestien määrän,...). Tämä yhteenveto on "
+"valmiiksi  html-muodossa, jotta se voidaan viedä kanban näkymään."
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr "Ota yhteyttä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr "Aihe"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr "Jätä pois"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr "Tärkeys"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr "Valtio"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr "Seuraajat"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr "Maksutapa"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr "Uusi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr "Sähköposti"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr "Kanava"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr "Alin"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr "Luontipäivä"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "Tyyppiä käytetään erottamaan liidit ja mahdollisuudet toisistaan"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr "Kategoriat"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr "Vaihe"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr "Käyttäjätunnus"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr "Yhteystiedon nimi"
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr "Kontakti"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Kumppanin yhteystieto, sähköposti"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Odotetut tulot"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr "Yhteydenottolomake"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr "Valuutta"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr "Päivityksen ajankohta"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr "Odotettu päätös"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr "Viittaus 2"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr "Avattu"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr "Kesken"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr "Myyjä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 750ae12995f..2da55bcb081 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -13,6 +13,7 @@
             
             
             ${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}
+            ${object.partner_id.lang}
             
 
@@ -102,6 +103,7 @@
             
             
             Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}
+            ${object.partner_id.lang}
             
 
diff --git a/addons/product/i18n/am.po b/addons/product/i18n/am.po
new file mode 100644
index 00000000000..466eca830fc
--- /dev/null
+++ b/addons/product/i18n/am.po
@@ -0,0 +1,2475 @@
+# Amharic translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-11-29 09:01+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Amharic \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-30 05:04+0000\n"
+"X-Generator: Launchpad (build 16856)\n"
+
+#. module: product
+#: field:product.packaging,rows:0
+msgid "Number of Layers"
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.item,base:0
+msgid "Base price for computation."
+msgstr ""
+
+#. module: product
+#: help:product.product,seller_qty:0
+msgid "This is minimum quantity to purchase from Main Supplier."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_34_product_template
+msgid "Webcam"
+msgstr "የዌብ ካሜራ"
+
+#. module: product
+#: field:product.product,incoming_qty:0
+msgid "Incoming"
+msgstr "የሚመጣው"
+
+#. module: product
+#: view:product.product:0
+msgid "Product Name"
+msgstr "የእቃው ስም"
+
+#. module: product
+#: view:product.template:0
+msgid "Second Unit of Measure"
+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
+#: field:product.product,seller_qty:0
+msgid "Supplier Quantity"
+msgstr "ብዛት"
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Fixed"
+msgstr "ቛሚ"
+
+#. module: product
+#: model:product.template,name:product.product_product_10_product_template
+msgid "Mouse, Optical"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "Base Prices"
+msgstr "ዋጋ"
+
+#. module: product
+#: field:product.pricelist.item,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: product
+#: help:product.template,list_price:0
+msgid ""
+"Base price to compute the customer price. Sometimes called the catalog price."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_3_product_template
+msgid "PC Assemble SC234"
+msgstr ""
+
+#. module: product
+#: help:product.product,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: product
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
+#, python-format
+msgid "Warning!"
+msgstr "ማስጠንቀቅያ!"
+
+#. module: product
+#: field:product.product,image_small:0
+msgid "Small-sized image"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
+#, python-format
+msgid ""
+"Conversion from Product UoM %s to Default UoM %s is not possible as they "
+"both belong to different Category!."
+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
+#: field:product.template,uos_coeff:0
+msgid "Unit of Measure -> UOS Coeff"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,price_list:0
+msgid "PriceList"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_4_product_template
+msgid "PC Assemble SC349"
+msgstr ""
+
+#. module: product
+#: help:product.product,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
+#: model:product.pricelist.version,name:product.ver0
+msgid "Default Public Pricelist Version"
+msgstr ""
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Standard Price"
+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
+#: view:product.template:0
+#: field:product.template,type:0
+msgid "Product Type"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:412
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: product
+#: constraint:decimal.precision:0
+msgid ""
+"Error! You cannot define the decimal precision of 'Account' as greater than "
+"the rounding factor of the company's main currency"
+msgstr ""
+
+#. module: product
+#: field:product.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_33_product_template
+msgid "Headset for laptop PC with USB connector."
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_all
+msgid "All products"
+msgstr ""
+
+#. module: product
+#: model:process.node,note:product.process_node_supplier0
+msgid "Supplier name, price, product code, ..."
+msgstr ""
+
+#. module: product
+#: constraint:res.currency:0
+msgid ""
+"Error! You cannot define a rounding factor for the company's main currency "
+"that is smaller than the decimal precision of 'Account'."
+msgstr ""
+
+#. module: product
+#: help:product.product,outgoing_qty:0
+msgid ""
+"Quantity of products that are planned to leave.\n"
+"In a context with a single Stock Location, this includes goods leaving this "
+"Location, or any of its children.\n"
+"In a context with a single Warehouse, this includes goods leaving the Stock "
+"Location of this Warehouse, or any of its children.\n"
+"In a context with a single Shop, this includes goods leaving the Stock "
+"Location of the Warehouse of this Shop, or any of its children.\n"
+"Otherwise, this includes goods leaving any Stock Location with 'internal' "
+"type."
+msgstr ""
+
+#. module: product
+#: model:product.template,description_sale:product.product_product_42_product_template
+msgid ""
+"Office Editing Software with word processing, spreadsheets, presentations, "
+"graphics, and databases..."
+msgstr ""
+
+#. module: product
+#: field:product.product,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
+#: help:product.product,active:0
+msgid ""
+"If unchecked, it will allow you to hide the product without removing it."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: field:product.template,categ_id:0
+#: field:product.uom,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_25_product_template
+msgid "Laptop E5023"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,ul_qty:0
+msgid "The number of packages by layer"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_30_product_template
+msgid "Pen drive, SP-4"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,qty:0
+msgid "Quantity by Package"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_29_product_template
+msgid "Pen drive, SP-2"
+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
+#: model:product.price.type,name:product.list_price
+#: field:product.product,lst_price:0
+msgid "Public Price"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,qty5:0
+msgid "Quantity-5"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_ul_form_action
+msgid ""
+"
\n"
+"                Click to add a new packaging type.\n"
+"              
\n"
+"                The packaging type define the dimensions as well as the "
+"number\n"
+"                of products per package. This will ensure salesperson sell "
+"the\n"
+"                right number of products according to the package selected.\n"
+"              
\n"
+"            "
+msgstr ""
+
+#. module: product
+#: field:product.template,product_manager:0
+msgid "Product Manager"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_7_product_template
+msgid "17” LCD Monitor"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,product_name:0
+msgid "Supplier Product Name"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price Search"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+#: field:product.template,description_sale:0
+msgid "Sale Description"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,length:0
+msgid "The length of the package"
+msgstr ""
+
+#. module: product
+#: field:product.product,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: product
+#: help:product.template,weight_net:0
+msgid "The net weight in Kg."
+msgstr ""
+
+#. module: product
+#: field:pricelist.partnerinfo,min_quantity:0
+#: field:product.supplierinfo,qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: product
+#: view:product.price_list:0
+msgid "Calculate Product Price per Unit Based on Pricelist Version."
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.item,product_id:0
+msgid ""
+"Specify a product if this rule only applies to one product. Keep empty "
+"otherwise."
+msgstr ""
+
+#. module: product
+#: model:product.uom.categ,name:product.product_uom_categ_kgm
+msgid "Weight"
+msgstr ""
+
+#. module: product
+#: help:product.product,virtual_available:0
+msgid ""
+"Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n"
+"In a context with a single Stock Location, this includes goods stored in "
+"this location, or any of its children.\n"
+"In a context with a single Warehouse, this includes goods stored in the "
+"Stock Location of this Warehouse, or any of its children.\n"
+"In a context with a single Shop, this includes goods stored in the Stock "
+"Location of the Warehouse of this Shop, or any of its children.\n"
+"Otherwise, this includes goods stored in any Stock Location with 'internal' "
+"type."
+msgstr ""
+
+#. module: product
+#: field:product.packaging,height:0
+msgid "Height"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Procurements"
+msgstr ""
+
+#. module: product
+#: model:res.groups,name:product.group_mrp_properties
+msgid "Manage Properties of Product"
+msgstr ""
+
+#. module: product
+#: help:product.uom,factor:0
+msgid ""
+"How much bigger or smaller this unit is compared to the reference Unit of "
+"Measure for this category:\n"
+"1 * (reference unit) = ratio * (this unit)"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_pricelist_partnerinfo
+msgid "pricelist.partnerinfo"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,qty2:0
+msgid "Quantity-2"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,qty3:0
+msgid "Quantity-3"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,qty1:0
+msgid "Quantity-1"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,qty4:0
+msgid "Quantity-4"
+msgstr ""
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_44_product_template
+msgid "GrapWorks Software"
+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_42_product_template
+msgid "Office Suite"
+msgstr ""
+
+#. module: product
+#: field:product.template,mes_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_32_product_template
+msgid "Headset standard"
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
+#. module: product
+#: help:product.product,incoming_qty:0
+msgid ""
+"Quantity of products that are planned to arrive.\n"
+"In a context with a single Stock Location, this includes goods arriving to "
+"this Location, or any of its children.\n"
+"In a context with a single Warehouse, this includes goods arriving to the "
+"Stock Location of this Warehouse, or any of its children.\n"
+"In a context with a single Shop, this includes goods arriving to the Stock "
+"Location of the Warehouse of this Shop, or any of its children.\n"
+"Otherwise, this includes goods arriving to any Stock Location with "
+"'internal' type."
+msgstr ""
+
+#. module: product
+#: constraint:product.template:0
+msgid ""
+"Error: The default Unit of Measure and the purchase Unit of Measure must be "
+"in the same category."
+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 ""
+
+#. module: product
+#: field:product.template,warranty:0
+msgid "Warranty"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Price Computation"
+msgstr ""
+
+#. module: product
+#: constraint:product.product:0
+msgid ""
+"You provided an invalid \"EAN13 Barcode\" reference. You may use the "
+"\"Internal Reference\" field instead."
+msgstr ""
+
+#. module: product
+#: model:res.groups,name:product.group_purchase_pricelist
+msgid "Purchase Pricelists"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_5_product_template
+msgid "PC Assemble + Custom (PC on Demand)"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
+msgstr ""
+
+#. module: product
+#: help:product.packaging,width:0
+msgid "The width of the package"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:361
+#, python-format
+msgid "Unit of Measure categories Mismatch!"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_36_product_template
+msgid "Blank DVD-RW"
+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
+#: field:product.category,parent_left:0
+msgid "Left Parent"
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.item,price_max_margin:0
+msgid "Specify the maximum amount of margin over the base price."
+msgstr ""
+
+#. module: product
+#: constraint:product.pricelist.item:0
+msgid ""
+"Error! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+"Item!"
+msgstr ""
+
+#. module: product
+#: view:product.price_list:0
+msgid "or"
+msgstr ""
+
+#. module: product
+#: constraint:product.packaging:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,min_quantity:0
+msgid "Min. Quantity"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_12_product_template
+msgid "Mouse, Wireless"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_22_product_template
+msgid "Processor Core i5 2.70 Ghz"
+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
+#: 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_18_product_template
+msgid "HDD SH-2"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_17_product_template
+msgid "HDD SH-1"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
+msgid "Supplier"
+msgstr ""
+
+#. module: product
+#: help:product.template,cost_method:0
+msgid ""
+"Standard Price: The cost price is manually updated at the end of a specific "
+"period (usually every year). \n"
+"Average Price: The cost price is recomputed at each incoming shipment."
+msgstr ""
+
+#. module: product
+#: field:product.product,qty_available:0
+msgid "Quantity On Hand"
+msgstr ""
+
+#. module: product
+#: field:product.price.type,name:0
+msgid "Price Name"
+msgstr ""
+
+#. module: product
+#: help:product.product,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: product
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
+msgstr ""
+
+#. module: product
+#: 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
+#: field:product.product,virtual_available:0
+msgid "Forecasted Quantity"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Purchase"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_33_product_template
+msgid "Headset USB"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: product
+#: model:res.groups,name:product.group_sale_pricelist
+msgid "Sales Pricelists"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "New Price ="
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_7
+msgid "Accessories"
+msgstr ""
+
+#. module: product
+#: model:process.transition,name:product.process_transition_supplierofproduct0
+msgid "Supplier of the product"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_28_product_template
+msgid "External Hard disk"
+msgstr ""
+
+#. module: product
+#: help:product.template,standard_price:0
+msgid ""
+"Cost price of the product used for standard stock valuation in accounting "
+"and used as a base price on purchase orders."
+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
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
+#. module: product
+#: view:product.price_list:0
+msgid "Print"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: field:product.ul,type:0
+#: field:product.uom,uom_type:0
+msgid "Type"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action2
+#: model:ir.actions.act_window,name:product.product_pricelist_action_for_purchase
+#: 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
+#: field:product.pricelist.type,key:0
+msgid "Key"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_pricelist
+#: model:ir.model,name:product.model_product_pricelist
+#: field:product.product,pricelist_id:0
+#: view:product.supplierinfo:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_hour
+msgid "Hour(s)"
+msgstr ""
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Development"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_res_partner
+msgid "Partner"
+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
+#: field:product.pricelist.item,price_round:0
+msgid "Price Rounding"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_1_product_template
+msgid "On Site Monitoring"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "days"
+msgstr ""
+
+#. module: product
+#: model:process.node,name:product.process_node_supplier0
+#: view:product.supplierinfo:0
+msgid "Supplier Information"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_res_currency
+#: 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_46_product_template
+msgid "Datacard"
+msgstr ""
+
+#. module: product
+#: help:product.template,uos_coeff:0
+msgid ""
+"Coefficient to convert default Unit of Measure to Unit of Sale\n"
+" uos = uom * coeff"
+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
+#: view:product.category:0
+msgid "Product Categories"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "Procurement & Locations"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_20_product_template
+msgid "Motherboard I9P57"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,weight:0
+msgid "Total Package Weight"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,code:0
+msgid "The code of the transport unit."
+msgstr ""
+
+#. module: product
+#: view:product.price.type:0
+msgid "Products Price Type"
+msgstr ""
+
+#. module: product
+#: field:product.product,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: product
+#: field:product.product,price_extra:0
+msgid "Variant Price Extra"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_supplierinfo
+msgid "Information about a product supplier"
+msgstr ""
+
+#. module: product
+#: help:product.uom,factor_inv:0
+msgid ""
+"How many times this Unit of Measure is bigger than the reference Unit of "
+"Measure in this category:\n"
+"1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+
+#. module: product
+#: 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.pricelist.item,min_quantity:0
+msgid ""
+"Specify the minimum quantity that needs to be bought/sold for the rule to "
+"apply."
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.version,date_start:0
+msgid "First valid date for the version."
+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
+#: model:product.template,description_sale:product.product_product_3_product_template
+msgid ""
+"17\" LCD Monitor\n"
+"Processor AMD 8-Core\n"
+"512MB RAM\n"
+"HDD SH-1"
+msgstr ""
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Stockable Product"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,code:0
+msgid "Code"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_27_product_template
+msgid "Laptop Customized"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_ul
+msgid "Shipping Unit"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_35_product_template
+msgid "Blank CD"
+msgstr ""
+
+#. module: product
+#: field:pricelist.partnerinfo,suppinfo_id:0
+msgid "Partner Information"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action_sell
+msgid ""
+"
\n"
+"                Click to define a new product.\n"
+"              
\n"
+"                You must define a product for everything you sell, whether "
+"it's\n"
+"                a physical product, a consumable or a service you offer to\n"
+"                customers.\n"
+"              
\n"
+"                The product form contains information to simplify the sale\n"
+"                process: price, notes in the quotation, accounting data,\n"
+"                procurement methods, etc.\n"
+"              
\n"
+"            "
+msgstr ""
+
+#. module: product
+#: view:product.price_list:0
+msgid "Cancel"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_37_product_template
+msgid "All in one hi-speed printer with fax and scanner."
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,min_qty:0
+msgid ""
+"The minimal quantity to purchase to this supplier, expressed in the supplier "
+"Product Unit of Measure if not empty, in the default unit of measure of the "
+"product otherwise."
+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
+#: field:pricelist.partnerinfo,price:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: product
+#: field:product.category,parent_right:0
+msgid "Right Parent"
+msgstr ""
+
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_surcharge:0
+msgid "Price Surcharge"
+msgstr ""
+
+#. module: product
+#: field:product.product,code:0
+#: field:product.product,default_code:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_8_product_template
+msgid "USB Keyboard, QWERTY"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_9
+msgid "Softwares"
+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.categ,name:0
+msgid "Name"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_4
+msgid "Computers"
+msgstr ""
+
+#. module: product
+#: help:product.product,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_kgm
+msgid "kg"
+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
+#: field:product.template,standard_price:0
+msgid "Cost"
+msgstr ""
+
+#. module: product
+#: help:product.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
+#. module: product
+#: field:product.uom,factor:0
+#: field:product.uom,factor_inv:0
+msgid "Ratio"
+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
+#: view:product.template:0
+#: field:product.template,uom_id:0
+#: field:product.uom,name:0
+msgid "Unit of Measure"
+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
+#: field:product.product,message_unread:0
+msgid "Unread Messages"
+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 "Unit of Measure Categories"
+msgstr ""
+
+#. module: product
+#: help:product.product,seller_id:0
+msgid "Main Supplier who has highest priority in Supplier List."
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_5
+#: view:product.product:0
+msgid "Services"
+msgstr ""
+
+#. module: product
+#: help:product.product,ean13:0
+msgid "International Article Number used for product identification."
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_category_action
+msgid ""
+"
\n"
+"                Here is a list of all your products classified by category. "
+"You\n"
+"                can click a category to get the list of all products linked "
+"to\n"
+"                this category or to a child of this category.\n"
+"              
\n"
+"            "
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:361
+#, python-format
+msgid ""
+"New Unit of Measure '%s' must belong to same Unit of Measure category '%s' "
+"as of old Unit of Measure '%s'. If you need to change the unit of measure, "
+"you may deactivate this product from the 'Procurements' tab and create a new "
+"one."
+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_sell
+#: model:ir.actions.act_window,name:product.product_normal_action_tree
+#: model:ir.ui.menu,name:product.menu_products
+#: model:ir.ui.menu,name:product.prod_config_main
+#: view:product.product:0
+msgid "Products"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_32_product_template
+msgid ""
+"Hands free headset for laptop PC with in-line microphone and headphone plug."
+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,price_min_margin:0
+msgid "Specify the minimum amount of margin over the base price."
+msgstr ""
+
+#. module: product
+#: field:product.template,weight_net:0
+msgid "Net Weight"
+msgstr ""
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Pallet Dimension"
+msgstr ""
+
+#. module: product
+#: help:product.product,image:0
+msgid ""
+"This field holds the image used as image for the product, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.item,categ_id:0
+msgid ""
+"Specify a product category if this rule only applies to products belonging "
+"to this category or its children categories. Keep empty otherwise."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Inventory"
+msgstr ""
+
+#. module: product
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:732
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_2_product_template
+msgid "On Site Assistance"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_39_product_template
+msgid "Toner Cartridge"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_form_action
+#: model:ir.ui.menu,name:product.next_id_16
+#: view:product.uom:0
+msgid "Units of Measure"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,min_qty:0
+msgid "Minimal Quantity"
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,product_code:0
+msgid ""
+"This supplier's product code will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_43_product_template
+msgid "Zed+ Antivirus"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_version_id:0
+msgid "Price List Version"
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.item,sequence:0
+msgid ""
+"Gives the order in which the pricelist items will be checked. The evaluation "
+"gives highest priority to lowest sequence and stops as soon as a matching "
+"item is found."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: selection:product.template,type:0
+msgid "Consumable"
+msgstr ""
+
+#. module: product
+#: help:product.price.type,currency_id:0
+msgid "The currency the field is expressed in."
+msgstr ""
+
+#. module: product
+#: help:product.template,weight:0
+msgid "The gross weight in Kg."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_37_product_template
+msgid "Printer, All-in-one"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "Procurement"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_23_product_template
+msgid "Processor AMD 8-Core"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Weights"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Description for Quotations"
+msgstr ""
+
+#. module: product
+#: help:pricelist.partnerinfo,price:0
+msgid ""
+"This price will be considered as a price for the supplier Unit of Measure if "
+"any or the default Unit of Measure of the product otherwise"
+msgstr ""
+
+#. module: product
+#: field:product.template,uom_po_id:0
+msgid "Purchase Unit of Measure"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Group by..."
+msgstr ""
+
+#. module: product
+#: field:product.product,image_medium:0
+msgid "Medium-sized image"
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+#: model:product.uom.categ,name:product.product_uom_categ_unit
+msgid "Unit"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.version,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_38_product_template
+msgid "Ink Cartridge"
+msgstr ""
+
+#. module: product
+#: 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
+#: model:ir.actions.act_window,help:product.product_pricelist_action
+msgid ""
+"
\n"
+"                Click to add a pricelist version.\n"
+"              
\n"
+"                There can be more than one version of a pricelist, each of\n"
+"                these must be valid during a certain period of time. Some\n"
+"                examples of versions: Main Prices, 2010, 2011, Summer "
+"Sales,\n"
+"                etc.\n"
+"              
\n"
+"            "
+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
+#: view:product.pricelist:0
+msgid "Products Price"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_26_product_template
+msgid ""
+"17\" Monitor\n"
+"6GB RAM\n"
+"Hi-Speed 234Q Processor\n"
+"QWERTY keyboard"
+msgstr ""
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Consumable products"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_21_product_template
+msgid "Motherboard A20Z7"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_1_product_template
+#: model:product.template,description_sale:product.product_product_1_product_template
+msgid "This type of service include basic monitoring of products."
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.version,date_end:0
+msgid "Last valid date for the version."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_19_product_template
+msgid "HDD on Demand"
+msgstr ""
+
+#. module: product
+#: field:product.price.type,active:0
+#: field:product.pricelist,active:0
+#: field:product.pricelist.version,active:0
+#: field:product.product,active:0
+#: field:product.uom,active:0
+msgid "Active"
+msgstr ""
+
+#. module: product
+#: field:product.product,price_margin:0
+msgid "Variant Price Margin"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist,name:0
+msgid "Pricelist Name"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
+msgstr ""
+
+#. module: product
+#: sql_constraint:product.uom:0
+msgid "The conversion ratio for a unit of measure cannot be 0!"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_24_product_template
+msgid "Graphics Card"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,ean:0
+msgid "The EAN code of the package unit."
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,product_uom:0
+msgid "This comes from the product form."
+msgstr ""
+
+#. module: product
+#: field:product.packaging,weight_ul:0
+msgid "Empty Package Weight"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_41_product_template
+msgid "Windows Home Server 2011"
+msgstr ""
+
+#. module: product
+#: field:product.price.type,field:0
+msgid "Product Field"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_5_product_template
+msgid "Custom computer assembled on order based on customer's requirement."
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_price_type_action
+#: model:ir.ui.menu,name:product.menu_product_price_type
+msgid "Price Types"
+msgstr ""
+
+#. module: product
+#: help:product.template,uom_id:0
+msgid "Default Unit of Measure used for all stock operation."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Sales"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
+msgid ""
+"
\n"
+"                Click to add a new unit of measure category.\n"
+"              
\n"
+"                Units of measure belonging to the same category can be\n"
+"                converted between each others. For example, in the category\n"
+"                'Time', you will have the following units of "
+"measure:\n"
+"                Hours, Days.\n"
+"              
\n"
+"            "
+msgstr ""
+
+#. module: product
+#: help:pricelist.partnerinfo,min_quantity:0
+msgid ""
+"The minimal quantity to trigger this rule, expressed in the supplier Unit of "
+"Measure if any or in the default Unit of Measure of the product otherrwise."
+msgstr ""
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Smaller than the reference Unit of Measure"
+msgstr ""
+
+#. module: product
+#: model:product.pricelist,name:product.list0
+msgid "Public Pricelist"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,product_code:0
+msgid "Supplier Product Code"
+msgstr ""
+
+#. module: product
+#: help:product.pricelist,active:0
+msgid ""
+"If unchecked, it will allow you to hide the pricelist without removing it."
+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
+#: model:ir.model,name:product.model_product_product
+#: 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
+#: view:product.product:0
+msgid "Price:"
+msgstr ""
+
+#. module: product
+#: field:product.template,weight:0
+msgid "Gross Weight"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by pallet or box."
+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:product.template,name:product.product_product_16_product_template
+msgid "Computer Case"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_9_product_template
+msgid "USB Keyboard, AZERTY"
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,sequence:0
+msgid "Assigns the priority to the list of product supplier."
+msgstr ""
+
+#. module: product
+#: constraint:product.pricelist.item:0
+msgid "Error! The minimum margin should be lower than the maximum margin."
+msgstr ""
+
+#. module: product
+#: model:res.groups,name:product.group_uos
+msgid "Manage Secondary Unit of Measure"
+msgstr ""
+
+#. module: product
+#: help:product.uom,rounding:0
+msgid ""
+"The computed quantity will be a multiple of this value. Use 1.0 for a Unit "
+"of Measure that cannot be further split, such as a piece."
+msgstr ""
+
+#. 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 ""
+
+#. module: product
+#: model:product.template,name:product.product_product_47_product_template
+msgid "Switch, 24 ports"
+msgstr ""
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Bigger than the reference Unit of Measure"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_consultant_product_template
+#: selection:product.template,type:0
+msgid "Service"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "Internal Description"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_48_product_template
+msgid "USB Adapter"
+msgstr ""
+
+#. module: product
+#: help:product.template,uos_id:0
+msgid ""
+"Sepcify a unit of measure here if invoicing is made in another unit of "
+"measure than inventory. Keep empty to use the default unit of measure."
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:208
+#, python-format
+msgid "Cannot change the category of existing Unit of Measure '%s'."
+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
+#: view:product.product:0
+#: field:product.supplierinfo,company_id:0
+#: field:product.template,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_26_product_template
+msgid "Laptop S3450"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Default Unit of Measure"
+msgstr ""
+
+#. module: product
+#: code:addons/product/pricelist.py:377
+#, 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
+#: model:product.category,name:product.product_category_3
+msgid "Other Products"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_9_product_template
+msgid "This product is configured with example of push/pull flows"
+msgstr ""
+
+#. module: product
+#: field:product.product,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
+#, python-format
+msgid "Error!"
+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.category,name:product.product_category_8
+msgid "Components"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_type
+#: field:product.pricelist,type:0
+msgid "Pricelist Type"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_6
+msgid "External Devices"
+msgstr ""
+
+#. module: product
+#: field:product.product,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: product
+#: help:product.template,sale_ok:0
+msgid "Specify if the product can be selected in a sales order line."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: 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_10
+msgid "Raw Materials"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_13_product_template
+msgid "RAM SR5"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_14_product_template
+msgid "RAM SR2"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action_puchased
+msgid ""
+"
\n"
+"                Click to define a new product.\n"
+"              
\n"
+"                You must define a product for everything you purchase, "
+"whether\n"
+"                it's a physical product, a consumable or services you buy "
+"to\n"
+"                subcontractants.\n"
+"              
\n"
+"                The product form contains detailed information to improve "
+"the\n"
+"                purchase process: prices, procurement logistics, accounting "
+"data,\n"
+"                available suppliers, etc.\n"
+"              
\n"
+"            "
+msgstr ""
+
+#. module: product
+#: model:product.template,description_sale:product.product_product_44_product_template
+msgid "Full featured image editing software."
+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 ""
+
+#. module: product
+#: model:product.template,name:product.product_product_31_product_template
+msgid "Multimedia Speakers"
+msgstr ""
+
+#. module: product
+#: field:product.product,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Sale Conditions"
+msgstr ""
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Palletization"
+msgstr ""
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Price List Name"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Description for Suppliers"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "months"
+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.product,seller_delay:0
+msgid "Supplier Lead Time"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_decimal_precision
+msgid "decimal.precision"
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Box"
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.item,price_surcharge:0
+msgid ""
+"Specify the fixed amount to add or substract(if negative) to the amount "
+"calculated with the discount."
+msgstr ""
+
+#. module: product
+#: help:product.product,qty_available:0
+msgid ""
+"Current quantity of products.\n"
+"In a context with a single Stock Location, this includes goods stored at "
+"this Location, or any of its children.\n"
+"In a context with a single Warehouse, this includes goods stored in the "
+"Stock Location of this Warehouse, or any of its children.\n"
+"In a context with a single Shop, this includes goods stored in the Stock "
+"Location of the Warehouse of this Shop, or any of its children.\n"
+"Otherwise, this includes goods stored in any Stock Location with 'internal' "
+"type."
+msgstr ""
+
+#. module: product
+#: help:product.template,type:0
+msgid ""
+"Consumable: Will not imply stock management for this product. \n"
+"Stockable product: Will imply stock management for this product."
+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:ir.actions.act_window,help:product.product_normal_action
+msgid ""
+"
\n"
+"                Click to define a new product.\n"
+"              
\n"
+"                You must define a product for everything you buy or sell,\n"
+"                whether it's a physical product, a consumable or service.\n"
+"              
\n"
+"            "
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Context..."
+msgstr ""
+
+#. module: product
+#: field:product.packaging,ul:0
+msgid "Type of Package"
+msgstr ""
+
+#. module: product
+#: help:product.category,type:0
+msgid ""
+"A category of the view type is a virtual category that can be used as the "
+"parent of another category to create a hierarchical structure."
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pack"
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.item,product_tmpl_id:0
+msgid ""
+"Specify a template if this rule only applies to one product template. Keep "
+"empty otherwise."
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_2_product_template
+msgid ""
+"This type of service include assistance for security questions, system "
+"configuration requirements, implementation or special needs."
+msgstr ""
+
+#. module: product
+#: field:product.product,image:0
+msgid "Image"
+msgstr ""
+
+#. module: product
+#: view:product.uom.categ:0
+msgid "Units of Measure categories"
+msgstr ""
+
+#. module: product
+#: model:product.template,description_sale:product.product_product_4_product_template
+msgid ""
+"19\" LCD Monitor\n"
+"Processor Core i5 2.70 Ghz\n"
+"2GB RAM\n"
+"HDD SH-1"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "Descriptions"
+msgstr ""
+
+#. module: product
+#: model:res.groups,name:product.group_stock_packaging
+msgid "Manage Product Packaging"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_2
+msgid "Internal"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_45_product_template
+msgid "Router R430"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,sequence:0
+msgid "Gives the sequence order when displaying a list of packaging."
+msgstr ""
+
+#. module: product
+#: selection:product.category,type:0
+#: selection:product.template,state:0
+msgid "Normal"
+msgstr ""
+
+#. module: product
+#: code:addons/product/pricelist.py:179
+#, python-format
+msgid ""
+"At least one pricelist has no active version !\n"
+"Please create or activate one."
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_max_margin:0
+msgid "Max. Price Margin"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Min. 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
+#: model:ir.actions.act_window,help:product.product_pricelist_action_for_purchase
+msgid ""
+"
\n"
+"                Click to create a pricelist.\n"
+"              
\n"
+"                A price list contains rules to be evaluated in order to "
+"compute\n"
+"                the purchase price. The default price list has only one "
+"rule; use\n"
+"                the cost price defined on the product form, so that you do "
+"not have to\n"
+"                worry about supplier pricelists if you have very simple "
+"needs.\n"
+"              
\n"
+"                But you can also import complex price lists form your "
+"supplier\n"
+"                that may depends on the quantities ordered or the current\n"
+"                promotions.\n"
+"              
\n"
+"            "
+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
+msgid "Cost Price"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_min_margin:0
+msgid "Min. Price Margin"
+msgstr ""
+
+#. module: product
+#: model:res.groups,name:product.group_uom
+msgid "Manage Multiple Units of Measure"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,weight:0
+msgid "The weight of a full package, pallet or box."
+msgstr ""
+
+#. module: product
+#: view:product.uom:0
+msgid "e.g: 1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_25_product_template
+msgid ""
+"17\" Monitor\n"
+"4GB RAM\n"
+"Standard-1294P Processor\n"
+"QWERTY keyboard"
+msgstr ""
+
+#. module: product
+#: 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
+#: help:product.template,produce_delay:0
+msgid ""
+"Average delay in days to produce this product. In the case of multi-level "
+"BOM, the manufacturing lead times of the components will be added."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_assembly_product_template
+msgid "Assembly Service Cost"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_form_action
+msgid ""
+"
\n"
+"                Click to add a new unit of measure.\n"
+"              
\n"
+"                You must define a conversion rate between several Units of\n"
+"                Measure within the same category.\n"
+"              
\n"
+"            "
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_11_product_template
+msgid "Mouse, Laser"
+msgstr ""
+
+#. module: product
+#: view:product.template:0
+msgid "Delays"
+msgstr ""
+
+#. module: product
+#: field:product.category,type:0
+msgid "Category Type"
+msgstr ""
+
+#. module: product
+#: model:process.node,note:product.process_node_product0
+msgid "Creation of the product"
+msgstr ""
+
+#. module: product
+#: field:pricelist.partnerinfo,name:0
+#: field:product.packaging,name:0
+#: report:product.pricelist:0
+#: view:product.product:0
+#: field:product.template,description:0
+msgid "Description"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,ean:0
+msgid "EAN"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid " ) + "
+msgstr ""
+
+#. module: product
+#: field:product.template,volume:0
+#: model:product.uom.categ,name:product.product_uom_categ_vol
+msgid "Volume"
+msgstr ""
+
+#. module: product
+#: help:product.product,image_small:0
+msgid ""
+"Small-sized image of the product. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_40_product_template
+msgid "Windows 7 Professional"
+msgstr ""
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Reference Unit of Measure for this category"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,product_uom:0
+msgid "Supplier Unit of Measure"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Product Variant"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_6_product_template
+msgid "15” LCD Monitor"
+msgstr ""
+
+#. module: product
+#: code:addons/product/pricelist.py:379
+#: field:product.pricelist.item,base_pricelist_id:0
+#, python-format
+msgid "Other Pricelist"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,help:product.product_pricelist_action2
+msgid ""
+"
\n"
+"                Click to create a pricelist.\n"
+"              
\n"
+"                A price list contains rules to be evaluated in order to "
+"compute\n"
+"                the sales price of the products.\n"
+"              
\n"
+"                Price lists may have several versions (2010, 2011, Promotion "
+"of\n"
+"                February 2010, etc.) and each version may have several "
+"rules.\n"
+"                (e.g. the customer price of a product category will be based "
+"on\n"
+"                the supplier price multiplied by 1.80).\n"
+"              
\n"
+"            "
+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
+#: field:product.template,cost_method:0
+#: model:res.groups,name:product.group_costing_method
+msgid "Costing Method"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_category
+#: field:product.pricelist.item,categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_19_product_template
+msgid "On demand hard-disk having capacity based on requirement."
+msgstr ""
+
+#. module: product
+#: selection:product.template,state:0
+msgid "End of Lifecycle"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_15_product_template
+msgid "RAM SR3"
+msgstr ""
+
+#. module: product
+#: help:product.product,packaging:0
+msgid ""
+"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 ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_action
+#: field:product.pricelist,version_id:0
+msgid "Pricelist Versions"
+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 ""
+
+#. module: product
+#: field:product.template,list_price:0
+msgid "Sale Price"
+msgstr ""
+
+#. module: product
+#: help:product.uom,category_id:0
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
+#. module: product
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: product
+#: help:product.product,image_medium:0
+msgid ""
+"Medium-sized image of the product. It is automatically resized as a "
+"128x128px image, with aspect ratio preserved, only when the image exceeds "
+"one of those sizes. Use this field in form views or some kanban views."
+msgstr ""
+
+#. module: product
+#: view:product.uom:0
+msgid "e.g: 1 * (reference unit) = ratio * (this unit)"
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,qty:0
+msgid "This is a quantity which is converted into Default Unit of Measure."
+msgstr ""
+
+#. module: product
+#: help:product.template,volume:0
+msgid "The volume in m3."
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
+msgstr ""
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0f507c604f2..38e8fc9fdef 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -260,9 +260,7 @@
- - Task - Tasks + Tasks
@@ -370,7 +368,8 @@
- +

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 2e99b75046c..68c6712f530 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -48,7 +48,8 @@
- +