[MERGE] merge with main branch

bzr revid: avo@tinyerp.com-20140313052510-vnbxchpkv2j4maea

addons/account/account.py

@@ -30,7 +30,7 @@ from openerp import SUPERUSER_ID
 from openerp import pooler, tools
 from openerp.osv import fields, osv, expression
 from openerp.tools.translate import _
-from openerp.tools.float_utils import float_round
+from openerp.tools.float_utils import float_round as round
 
 import openerp.addons.decimal_precision as dp
 
@@ -1949,15 +1949,15 @@ class account_tax(osv.osv):
         #
         'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the tax declaration."),
         'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the tax declaration."),
-        'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
-        'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+        'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
+        'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
 
         # Same fields for refund invoices
 
         'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."),
         'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."),
-        'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
-        'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+        'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
+        'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'description': fields.char('Tax Code'),
@@ -2155,7 +2155,7 @@ class account_tax(osv.osv):
         tax_compute_precision = precision
         if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
             tax_compute_precision += 5
-        totalin = totalex = float_round(price_unit * quantity, precision)
+        totalin = totalex = round(price_unit * quantity, precision)
         tin = []
         tex = []
         for tax in taxes:

addons/account/account_view.xml

@@ -1588,7 +1588,6 @@
 	                        <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
 	                        <div attrs="{'invisible':[('value','=','balance')]}">
 	                            <field name="value_amount" class="oe_inline"/>
-	                            <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}" />
 	                        </div>
                         </group>
                         <group string="Due Date Computation">

addons/account/i18n/id.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-11 17:03+0000\n"
+"Last-Translator: williamlsd <mudy@tdmm.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:51+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -34,13 +34,13 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
-"Menentukan urutan tampilan dalam laporan 'Akunting\\Pelaporan\\Pelaporan "
-"Generik\\Pajak\\Laporan Pjak'"
+"Menentukan urutan tampilan dalam laporan 'Accounting \\ Reporting \\ Generic "
+"Reporting \\ Taxes \\ Taxes Report'"
 
 #. module: account
 #: view:res.partner:0
 msgid "the parent company"
-msgstr ""
+msgstr "perusahaan induk"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -68,7 +68,7 @@ msgstr "Sisa"
 #: code:addons/account/account_bank_statement.py:369
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr "Jurnal item \"%s\" tidak valid"
+msgstr "Item \"%s\" dalam Jurnal tidak valid"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -86,7 +86,7 @@ msgstr "Impor dari tagihan atau pembayaran"
 #: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "Akun Salah"
 
 #. module: account
 #: view:account.move:0
@@ -172,6 +172,9 @@ msgid ""
 "which is set after generating opening entries from 'Generate Opening "
 "Entries'."
 msgstr ""
+"Anda harus menetapkan 'End of Year Entries Journal' untuk tahun fiskal ini, "
+"yang akan ditetapkan setelah menghasilkan entri awal dari 'Generate Opening "
+"Entries'"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -190,6 +193,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik untuk menambah periode fiskal\n"
+"              </p><p>\n"
+"                Satu periode akunting biasanya adalah satu bulan atau satu "
+"kuartal. \n"
+"                Biasanya terkait dengan periode pajak.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -204,7 +215,7 @@ msgstr "Nama Kolom"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Jumlah digit untuk kode akun"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -224,6 +235,9 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Set akun analitik yang akan digunakan sebagai default pada baris pajak "
+"tagihan dalam invoice. Biarkan kosong jika anda tidak ingin menggunakan akun "
+"analitik pada baris pajak tagihan sebagai default."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -239,7 +253,7 @@ msgstr "Pindahkan baris rekonsiliasi terpilih"
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Catatan akuntansi adalah sebuah masukan dari rekonsiliasi"
+msgstr "Entri akunting adalah input rekonsiliasi"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -249,12 +263,12 @@ msgstr "Laporan menurut standar Belgia"
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
-msgstr ""
+msgstr "Tervalidasi"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
-msgstr ""
+msgstr "View Pendapatan"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -270,7 +284,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_next:0
 msgid "Next credit note number"
-msgstr ""
+msgstr "Nomor catatan kredit berikutnya"
 
 #. module: account
 #: help:account.config.settings,module_account_voucher:0
@@ -279,6 +293,9 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"Ini mencakup seluruh kebutuhan dasar untuk entri voucher bank, kas, "
+"penjualan, pembelian, biaya, kontra, dsb.\n"
+"                Menginstal modul account_voucher."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -310,6 +327,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik untuk membentuk refund dana pelanggan.\n"
+"              </p><p>\n"
+"                Refund adalah dokumen yang meng-kredit tagihan seluruhnya "
+"atau \n"
+"                sebagian.\n"
+"              </p><p>\n"
+"                Anda dapat menerbitkan refund langsung dari tagihan "
+"pelanggan,\n"
+"                tidak harus diterbitkan secara manual.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.installer,charts:0
@@ -328,7 +357,7 @@ msgstr "Pembatalan Rekonsiliasi Akun"
 #. module: account
 #: field:account.config.settings,module_account_budget:0
 msgid "Budget management"
-msgstr ""
+msgstr "Manajemen anggaran"
 
 #. module: account
 #: view:product.template:0
@@ -349,13 +378,13 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_multi_currency:0
 msgid "Allow multi currencies"
-msgstr ""
+msgstr "Izinkan mata uang jamak"
 
 #. module: account
 #: code:addons/account/account_invoice.py:77
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr ""
+msgstr "Anda harus mendefinisikan jurnal analitik tipe '%s'!"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -370,12 +399,12 @@ msgstr "Juni"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Anda harus memilih akun untuk di rekonsiliasi"
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Mengizinkan anda menggunakan akunting analitik"
 
 #. module: account
 #: view:account.invoice:0
@@ -383,18 +412,18 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Pramuniaga"
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr "Bertanggung Jawab"
+msgstr "Tanggung-jawab"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "tuntunan.akun.bank"
+msgstr "account.bank.accounts.wizard"
 
 #. module: account
 #: field:account.move.line,date_created:0
@@ -405,7 +434,7 @@ msgstr "Tanggal pembuatan"
 #. module: account
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Batalkan Tagihan"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -443,18 +472,25 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Memungkinkan anda mengatur aktiva yang dimiliki oleh perusahaan atau "
+"perseorangan.\n"
+"                Menyimpan depresiasi yang terjadi pada aktiva tersebut , dan "
+"membuat akun bergerak untuk baris depresiasinya.\n"
+"                Menginstal modul account_asset. Jika anda tidak mencentang "
+"kotak ini, anda bisa melakukan penagihan dan pembayaran, tetapi tidak bisa "
+"melakukan pembukuan (Jurnal Items, Chart of Accounts, ...)"
 
 #. module: account
 #: help:account.bank.statement.line,name:0
 msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Pembuat Informasi Penerima"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
 msgid "Period :"
-msgstr ""
+msgstr "Periode :"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -462,12 +498,13 @@ msgstr ""
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "Salinan Bagan Akun"
+msgstr "Template Bagan"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create refund, reconcile and create a new draft invoice"
 msgstr ""
+"Perubahan: buat pengembalian, rekonsiliasi, dan membuat draft tagihan baru"
 
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
@@ -481,11 +518,19 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Jika anda memilih 'Round per line' : untuk setiap pajak, nilai pajak awal "
+"akan dihitung dan dibulatkan untuk setiap baris PO/SO/Tagihan kemudian hasil "
+"pembulatan ini dijumlahkan, hasilnya adalah total pajak. Jika anda memilih "
+"'Round globally': untuk setiap pajak, jumlah pajak akan dihitung untuk "
+"setiap baris PO/SO/tagihan, kemudian jumlahnya barulah di bulatkan. Jika "
+"anda menjual dengan pajak, anda harusnya memilih 'Round per line' karena "
+"tentunya anda menginginkan agar nilai pajak pada subtotal sama dengan jumlah "
+"total pajak setiap baris."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr "tuntunan.multi.bagan.akun"
+msgstr "wizard.multi.charts.accounts"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -495,12 +540,12 @@ msgstr "Jumlah yang ditampilkan dalam mata uang pilihan lainnya"
 #. module: account
 #: view:account.journal:0
 msgid "Available Coins"
-msgstr ""
+msgstr "Koin yang tersedia"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr "Perbandingan diperbolehkan"
+msgstr "Izinkan Perbandingan"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -548,7 +593,7 @@ msgstr "Induk target"
 #. module: account
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Memberikan urutan baris ini saat menampilkan tagihan"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -592,7 +637,7 @@ msgstr "Bukan transaksi yang dapat direkonsiliasi"
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr "Lawan"
+msgstr "Counterpart"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -626,7 +671,7 @@ msgstr "Semua"
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Presisi desimal pada entri jurnal"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -652,6 +697,8 @@ msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
 msgstr ""
+"Jurnal dimaksud tidak memiliki entri akun bergerak pada kondisi draft untuk "
+"periode ini."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -674,12 +721,12 @@ msgstr "Urutan Utama harus berbeda dari yang sekarang !"
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "Mata uang saat ini tidak terkonfigurasi dengan baik."
 
 #. module: account
 #: field:account.journal,profit_account_id:0
 msgid "Profit Account"
-msgstr ""
+msgstr "Akun Profit"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1156
@@ -700,11 +747,19 @@ msgid ""
 "either the user pressed the button \"Nothing more to reconcile\" during the "
 "manual reconciliation process."
 msgstr ""
+"Tanggal dimana partner entri akunting terakhir kali sepenuhnya ter-"
+"rekonsiliasi. Berbeda dengan tanggal terakhir dimana suatu rekonsiliasi "
+"dilakukan untuk partner ini, karena disini kita menggambarkan fakta bahwa "
+"tidak ada lagi yang perlu di rekonsiliasi pada tanggal ini. Hal ini dapat "
+"dicapai dengan 2 cara berbeda: bisa entri debit/kredit terakhir yang belum "
+"di rekonsiliasi untuk partner ini di rekonsiliasikan, atau pengguna "
+"menggunakan tombol \"Tidak ada lagi yang perlu di rekonsiliasi\" pada proses "
+"rekonsiliasi manual."
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Laporan Penjualan Menurut Tipe Akun"
 
 #. module: account
 #: code:addons/account/account.py:3201
@@ -716,7 +771,7 @@ msgstr "SAJ"
 #: code:addons/account/account.py:1591
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "Tidak dapat membuat gerakan dengan mata uang berbeda dari .."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -724,6 +779,8 @@ msgid ""
 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
 "and 'draft' or ''}"
 msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
 
 #. module: account
 #: view:account.period:0
@@ -752,12 +809,16 @@ msgid ""
 "The amount expressed in the secondary currency must be positive when the "
 "journal item is a debit and negative when if it is a credit."
 msgstr ""
+"Jumlah pada mata uang sekunder harus positif saat item jurnal adalah debit "
+"dan negatif saat kredit."
 
 #. module: account
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
 msgstr ""
+"Anda tidak dapat membuat lebih dari satu pergerakan per periode pada jurnal "
+"tersentralisasi."
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -766,6 +827,9 @@ msgid ""
 "lines for refunds. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Set akun analitik yang akan digunakan sebagai default pada baris pajak "
+"tagihan untuk pengembalian. Tinggalkan kosong jika sebagai default anda "
+"tidak ingin menggunakan akun analitik pada baris pajak tagihan."
 
 #. module: account
 #: view:account.account:0
@@ -783,12 +847,12 @@ msgstr "Akun Piutang"
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
-msgstr ""
+msgstr "Konfigurasi akun bank perusahaan anda."
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Refund"
-msgstr ""
+msgstr "Buat Pengembalian"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -796,13 +860,13 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
-"Tanggal pada jurnal entri tidak sesuai dengan Period ! Anda harus merubah "
-"atau menghilangkan tanggal ini pada jurnal."
+"Tanggal pada jurnal entri tidak sesuai dengan Periode ! Anda harus merubah "
+"tanggal atau menghilangkan batasan ini dari jurnal."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr "Laporan Buku Besar Umum"
+msgstr "Laporan Buku Besar"
 
 #. module: account
 #: view:account.invoice:0
@@ -818,12 +882,12 @@ msgstr "Apakah anda yakin untuk membuat catatan baru?"
 #: code:addons/account/account_invoice.py:1361
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "Tagihan dibayar parsial: %s%s dari %s%s (%s%s tersisa)."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr "Print Faktur"
+msgstr "Cetak Tagihan"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:111
@@ -832,16 +896,19 @@ msgid ""
 "Cannot %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only refund this invoice."
 msgstr ""
+"Tidak dapat %s tagihan yang sudah di rekonsiliasi, tagihan seharusnya di-"
+"unreconciled terlebih dulu. Anda hanya dapat melakukan pengembalian atas "
+"tagihan ini."
 
 #. module: account
 #: view:account.account:0
 msgid "Account code"
-msgstr ""
+msgstr "Kode akun"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr "Tampilkan anak dengan terstruktur"
+msgstr "Tampilkan hirarki anak"
 
 #. module: account
 #: selection:account.payment.term.line,value:0

addons/account/i18n/it.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-02-04 12:00+0000\n"
-"Last-Translator: Leonardo Donelli <learts92@gmail.com>\n"
+"PO-Revision-Date: 2014-03-06 12:27+0000\n"
+"Last-Translator: Roberto Piva - NemesiX SRL <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-06 06:23+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:23+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -41,7 +41,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "the parent company"
-msgstr ""
+msgstr "l'azienda padre"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -897,7 +897,7 @@ msgstr ""
 #. module: account
 #: view:account.account:0
 msgid "Account code"
-msgstr ""
+msgstr "Codice conto"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -1847,7 +1847,7 @@ msgstr "Ricorrente"
 #. module: account
 #: report:account.invoice:0
 msgid "TIN :"
-msgstr ""
+msgstr "P.IVA:"
 
 #. module: account
 #: field:account.journal,groups_id:0

addons/account/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-02-14 01:42+0000\n"
-"Last-Translator: Yoshi Tashiro <yostashiro@gmail.com>\n"
+"PO-Revision-Date: 2014-03-08 05:09+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 07:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-09 06:02+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -3932,10 +3932,10 @@ msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
 "                クリックして顧客請求書を登録してください。\n"
 "              </p><p>\n"
-"                OpenERPの電子請求は顧客入金の回収を容易にします。\n"
-"                顧客は電子メールで請求書を受け取り、顧客のシステムがオンラインで支払うかインポートすることができます。\n"
+"                OpenERPの電子請求で顧客入金処理が簡単になります。\n"
+"                顧客はEメールで請求書を受け取り、そのままオンラインで支払ったり、システムにインポートしたりすることができます。\n"
 "              </p><p>\n"
-"                顧客との議論は各請求書の下部に自動で表示されます。\n"
+"                顧客とのコミュニケーション履歴は各請求書の下部に自動で表示されます。\n"
 "              </p>\n"
 "            "
 

addons/account/i18n/ko.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-05-14 01:08+0000\n"
-"Last-Translator: AhnJD <zion64@msn.com>\n"
+"PO-Revision-Date: 2014-03-12 04:39+0000\n"
+"Last-Translator: Gong HK <mymap.net@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:51+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -84,7 +84,7 @@ msgstr "청구서 또는 납부서로부터 가져오기"
 #: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "비정상 계정"
 
 #. module: account
 #: view:account.move:0
@@ -198,7 +198,7 @@ msgstr "열 라벨"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "계좌번호"
 
 #. module: account
 #: help:account.analytic.journal,type:0

addons/account/i18n/mn.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-02-18 03:11+0000\n"
+"PO-Revision-Date: 2014-03-11 06:15+0000\n"
 "Last-Translator: Jacara <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-19 05:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -3562,7 +3562,7 @@ msgstr "Нэхэмжлэлийн валют"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr "Тайлагнах Дансд"
+msgstr "Санхүүгийн тайлан"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -6176,7 +6176,7 @@ msgstr "Хөрөнгийн харагдац"
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr "Дансны Ерөнхий Дансны Тайлан"
+msgstr "Дансны ерөнхий тайлан"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6832,7 +6832,7 @@ msgstr "Захиалагчийн буцаалт"
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr "Гадаад бланс"
+msgstr "Валютын баланс"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -7233,7 +7233,7 @@ msgstr "Тулгалт: Дараагийн харилцагч руу очих"
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 msgid "Inverted Analytic Balance"
-msgstr "Урвуу шинжилгээний баланс"
+msgstr "Урвуу аналитик баланс"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
@@ -7651,7 +7651,7 @@ msgstr "Санхүүгийн Тайлангийн Стиль"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr "Нөөц тайлангийн тэмдэг"
+msgstr "Балансын тэмдэгийг хэвээр нь"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -8478,7 +8478,7 @@ msgstr "Хэсгийн Дугаар Алга !"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr "Дансны Тайлангийн Шатлал"
+msgstr "Тайлангийн загварын шатлал"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -9161,7 +9161,7 @@ msgstr "Орлогын толгой данс"
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr "Тохируулсан бланс"
+msgstr "Тохируулсан баланс"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -11040,7 +11040,7 @@ msgstr "Дэлгэрэнгүй байхгүй"
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr "Тэгшитгэгдээгүй Ашиг эсвэл Алдагдал"
+msgstr "Хэрэгжээгүй ашиг алдагдал"
 
 #. module: account
 #: view:account.move:0
@@ -11345,7 +11345,7 @@ msgstr "Авлагын данс"
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr "Урвуу шинжилгээний баланс -"
+msgstr "Урвуу аналитик баланс -"
 
 #. module: account
 #: field:temp.range,name:0

addons/account/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2013-11-30 13:59+0000\n"
+"PO-Revision-Date: 2014-03-06 05:07+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\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-01 05:45+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:23+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 "Language: tr\n"
 
 #. module: account
@@ -477,7 +477,7 @@ msgstr ""
 "                Bu, account_asset modülünü sisteme kurar. Eğer bu kutuyu "
 "işaretlemezseniz, fatura kesip ödeme kabul etme gibi,\n"
 "                işlemleri yapabilirsiniz ama gelişmiş muhasebe kayıtlarını "
-"(Günlükleri, Hesap planları, ...) tutamazsınız."
+"(Yevmiyeleri, Hesap planları, ...) tutamazsınız."
 
 #. module: account
 #: help:account.bank.statement.line,name:0
@@ -2365,7 +2365,7 @@ msgstr "Analitik hesap"
 #: code:addons/account/account_bank_statement.py:406
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr "Lütfen bu günlükte bir hesabın tanımlandığını doğrulayın."
+msgstr "Lütfen bu yevmiyede bir hesabın tanımlandığını doğrulayın."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -2500,7 +2500,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr "Bir satış günlüğüne bağlı Analitik Yevmiye Maddeleri."
+msgstr "Bir satış yevmiyesine bağlı Analitik Yevmiye Maddeleri."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4719,7 +4719,7 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
-"Burada en iyi yöntem, her mali yılın açılış girişleri için ayrı günlükleri "
+"Burada en iyi yöntem, her mali yılın açılış girişleri için ayrı yevmiyeleri "
 "kullanmaktır. Bu yevmiyeyi tanımlarken öntanımlı borç/alacak hesaplarını, "
 "hesap tipi olarak 'situation' ve bir merkezileştirmiş karşılık hesabıyla "
 "seçin."
@@ -6105,7 +6105,7 @@ msgstr "Matrah Tutarına Dahil et"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr "Tedarikçi Faturası Numarası"
+msgstr "Tedarikçi Fatura Numarası"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -6653,7 +6653,7 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr "Dönemi Zorla"
+msgstr "Döneme Zorla"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -7180,7 +7180,7 @@ msgstr "Kullanılmayan bir yevmiye kodu oluşturulamaz."
 #. module: account
 #: view:account.invoice:0
 msgid "force period"
-msgstr "dönemi zorla"
+msgstr "döneme zorla"
 
 #. module: account
 #: view:project.account.analytic.line:0
@@ -8095,7 +8095,7 @@ msgstr "Kasa Kalemlerini Kapatma"
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr "Hesap özeti"
+msgstr "Hesap Özeti"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
@@ -9759,7 +9759,7 @@ msgstr "Vergi Şablonu"
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr "Dönemi zorla"
+msgstr "Döneme zorla"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
@@ -10847,7 +10847,7 @@ msgstr "Kur Oranı"
 #. module: account
 #: view:account.config.settings:0
 msgid "e.g. sales@openerp.com"
-msgstr "örn. sales@openerp.com"
+msgstr "örn. satis@openerp.com"
 
 #. module: account
 #: field:account.account,tax_ids:0
@@ -10879,7 +10879,7 @@ msgstr "Uzlaştırma için Aç"
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr "Sol Ana"
+msgstr "Sol Üst"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -11026,7 +11026,7 @@ msgstr "Ayrıntı yok"
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr "Gerçekleşmemiş Kazanç ya da Zarar"
+msgstr "Gerçekleşmemiş Kazanç veya Zarar"
 
 #. module: account
 #: view:account.move:0
@@ -11189,7 +11189,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr "Hesaplar Boşaltınsın ? "
+msgstr "Boş Hesaplar ? "
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -11643,7 +11643,7 @@ msgstr "Elle Vergi Girilen Fatura"
 #: code:addons/account/account_invoice.py:573
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
-msgstr "Tedarikçi ödeme koşulunda ödeme koşulu kalemi yok!"
+msgstr "Tedarikçi ödeme koşulunda ödeme koşul kalemi yok."
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -11767,7 +11767,7 @@ msgstr "Yevmiye Maddelerini Ara"
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr "Genelde 1 veya -1"
+msgstr "Genelde 1 veya -1."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -11804,8 +11804,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-"Alacak ya da borç hesabına ait bir günlükte bakiye tutarı, kendi para birimi "
-"ile belirtilir (şirket para biriminden farklı olabilir)."
+"Alacak ya da borç hesabına ait bir yevmiyede bakiye tutarı, kendi para "
+"birimi ile belirtilir (şirket para biriminden farklı olabilir)."
 
 #~ msgid "VAT :"
 #~ msgstr "KDV :"

addons/account/i18n/zh_CN.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-01-23 04:15+0000\n"
-"Last-Translator: mrshelly <Unknown>\n"
+"PO-Revision-Date: 2014-03-06 08:48+0000\n"
+"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-24 06:24+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:23+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -312,9 +312,9 @@ msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
 "                点击创建一个客户退款. \n"
 "              </p><p>\n"
-"                退款是全部或部分借记销售传票的证明。\n"
+"                退款是全部或部分借记销售发票的证明。\n"
 "              </p><p>\n"
-"                可以直接从与客户相关联的传票直接生成退款，以代替手工创建客户退款。.\n"
+"                可以直接从与客户相关联的发票直接生成退款，以代替手工创建客户退款。.\n"
 "              </p>\n"
 "            "
 
@@ -447,7 +447,7 @@ msgid ""
 msgstr ""
 "此处可以管理属于公司或者个人的资产.\n"
 "                跟踪资产折旧的发生，创建折旧明细账户。.\n"
-"                要安装account_asset模块. 如果不检查box, 可以处理传票和付款,\n"
+"                要安装account_asset模块. 如果不检查box, 可以处理发票和付款,\n"
 "                但不能处理账记(分录明细, 科目表, ...)"
 
 #. module: account
@@ -838,7 +838,7 @@ msgstr "打印发票"
 msgid ""
 "Cannot %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only refund this invoice."
-msgstr "不能 %s 已经核销的发票, 发票必须被首先反核销.。只能退还这张发票。"
+msgstr "不能 %s 已经核销的发票, 发票必须被首先反核销。只能退还这张发票。"
 
 #. module: account
 #: view:account.account:0
@@ -1461,7 +1461,7 @@ msgstr "级别"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice."
-msgstr "您只能修改发票草稿的货币。"
+msgstr "您只能修改发票草稿的币种。"
 
 #. module: account
 #: report:account.invoice:0
@@ -1669,12 +1669,12 @@ msgstr "未执行。"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Credit Note"
-msgstr "冲销传票"
+msgstr "冲销发票"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr "电子传票和支付"
+msgstr "电子发票和支付"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1702,7 +1702,7 @@ msgstr "用于仪表盘视图的临时表"
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "供应商红字传票"
+msgstr "供应商红字发票"
 
 #. module: account
 #: report:account.invoice:0
@@ -1911,7 +1911,7 @@ msgstr "15 天"
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr "开传票"
+msgstr "开发票"
 
 #. module: account
 #: code:addons/account/report/account_partner_balance.py:115
@@ -2204,6 +2204,11 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"点击登记银行对账单</p><p>\n"
+"银行对账单是一个银行帐户在一定会计期间所发生的全部交易往来的汇总。你可以从银行周期性获得。\n"
+"</p><p>\n"
+"OpenERP允许对账单行直接和相关的销售或采购发票进行核销。\n"
+"            "
 
 #. module: account
 #: field:account.config.settings,currency_id:0
@@ -2485,7 +2490,7 @@ msgstr "检查供应商发票合计"
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr "形式传票"
+msgstr "形式发票"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2641,7 +2646,7 @@ msgstr "当账目记录有数据时，您将不能把它由关闭状态改变到
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr "传票明细"
+msgstr "发票明细"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -2657,8 +2662,8 @@ msgid ""
 "amount greater than the total invoiced amount. In order to avoid rounding "
 "issues, the latest line of your payment term must be of type 'balance'."
 msgstr ""
-"无法创建传票。\n"
-"相关的支付记录可能未确认核实，因为合计的总额大于传票的开票总额。为避免统计错误，请您确认最新的支付记录都在平衡状态。"
+"无法创建发票。\n"
+"相关的支付记录可能未确认核实，因为合计的总额大于发票的开票总额。为避免统计错误，请您确认最新的支付记录都在平衡状态。"
 
 #. module: account
 #: view:account.move:0
@@ -3369,7 +3374,7 @@ msgstr "搜寻会计周期"
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr "发票币别"
+msgstr "发票币种"
 
 #. module: account
 #: field:accounting.report,account_report_id:0
@@ -4040,7 +4045,7 @@ msgstr "如果您不选择会计期间，它将取所有开启的会计期间"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4215,7 +4220,7 @@ msgstr "应付账"
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "要生成分录的 会计区间没有找到。"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -4262,7 +4267,7 @@ msgstr "完全税收套账"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Full Reconciliation Date"
-msgstr ""
+msgstr "最后的完整核销日期"
 
 #. module: account
 #: field:account.account,name:0
@@ -4285,7 +4290,7 @@ msgstr "还没有配置好公司"
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "预计一个会计科目表"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4506,7 +4511,7 @@ msgstr "辅助核算余额"
 msgid ""
 "This payment term will be used instead of the default one for sale orders "
 "and customer invoices"
-msgstr ""
+msgstr "该付款方式将代替销售记录和客户发票的默认值。"
 
 #. module: account
 #: view:account.config.settings:0
@@ -4530,7 +4535,7 @@ msgstr "已记账分录明细"
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "No Follow-up"
-msgstr ""
+msgstr "未跟进"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4617,6 +4622,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"错误!\n"
+"你不能循环创建税代码"
 
 #. module: account
 #: constraint:account.period:0
@@ -4624,6 +4631,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"错误!\n"
+"这个会计期间的持续时间不合法。"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4640,7 +4649,7 @@ msgstr "月份"
 #: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
-msgstr ""
+msgstr "你不能改变已经包含了账簿项目的 科目代码!"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
@@ -4661,7 +4670,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: account
 #: field:res.company,paypal_account:0
@@ -4716,7 +4725,7 @@ msgstr "税基编码"
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
-msgstr ""
+msgstr "你必须提供一个科目来勾销/兑换凭证差异。"
 
 #. module: account
 #: help:res.company,paypal_account:0
@@ -4769,7 +4778,7 @@ msgstr "会计年度结账分录"
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "已平衡"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4782,13 +4791,13 @@ msgstr "发票或付款清单"
 msgid ""
 "There is currently no company without chart of account. The wizard will "
 "therefore not be executed."
-msgstr ""
+msgstr "目前还没有公司缺少科目表。因此，该向导不会被执行。"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Add an internal note..."
-msgstr ""
+msgstr "添加一个内部备注"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
@@ -4803,7 +4812,7 @@ msgstr "科目一览表"
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Payment Reference"
-msgstr ""
+msgstr "付款参考"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4872,7 +4881,7 @@ msgstr "欠款单据"
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "待调整日记账"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -5816,7 +5825,7 @@ msgstr "税编码"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "客户红字传票"
+msgstr "客户红字发票"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -6370,7 +6379,7 @@ msgstr "无"
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "客户红字传票"
+msgstr "客户红字发票"
 
 #. module: account
 #: field:account.account,foreign_balance:0
@@ -6876,7 +6885,7 @@ msgstr "你不能修改已经存在凭证的公司帐户。"
 #: selection:report.invoice.created,type:0
 #, python-format
 msgid "Supplier Refund"
-msgstr "供应商红字传票"
+msgstr "供应商红字发票"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -7447,7 +7456,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr "手工输入的传票是草稿状态"
+msgstr "手工输入的发票是草稿状态"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7798,7 +7807,7 @@ msgstr "发票明细"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr "客户和供应商红字传票"
+msgstr "客户和供应商红字发票"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7841,7 +7850,7 @@ msgstr "OPEJ"
 #: report:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr "形式传票"
+msgstr "形式发票"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -8464,7 +8473,7 @@ msgstr "如果在计算未来的税前这税额必须包含在税基金额里，
 #: code:addons/account/account.py:3196
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "采购红字传票账簿"
+msgstr "采购红字发票账簿"
 
 #. module: account
 #: code:addons/account/account.py:1333
@@ -8775,7 +8784,7 @@ msgstr "关闭一个会计年度"
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr "红字传票账簿"
+msgstr "红字发票账簿"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9019,7 +9028,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr "传票与付款"
+msgstr "发票与付款"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -9264,7 +9273,7 @@ msgstr ""
 #: code:addons/account/account.py:3195
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "销售红字传票账簿"
+msgstr "销售红字发票账簿"
 
 #. module: account
 #: view:account.move:0

addons/account_accountant/i18n/id.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-11 08:21+0000\n"
+"Last-Translator: williamlsd <mudy@tdmm.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:56+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Buka Menu Akunting"

addons/account_analytic_analysis/i18n/fr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-11 07:34+0000\n"
-"Last-Translator: Florian Hatat <Unknown>\n"
+"PO-Revision-Date: 2014-03-07 18:07+0000\n"
+"Last-Translator: Lionel Sausin - Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n"
-"X-Generator: Launchpad (build 16890)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -101,6 +101,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer un devis qui peut être converti en un "
+"commande de\n"
+"                vente.\n"
+"              </p><p>\n"
+"                Utiliser les commandes de vente pour suivre tout ce qui doit "
+"être facturé\n"
+"                à un prix fixe sur un contrat.\n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -120,7 +130,7 @@ msgstr "Total du temps passé facturé pour ce contrat."
 #. module: account_analytic_analysis
 #: model:email.template,subject:account_analytic_analysis.account_analytic_cron_email_template
 msgid "Contract expiration reminder ${user.company_id.name}"
-msgstr ""
+msgstr "Rappel expiration du contrat ${user.company_id.name}"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:464
@@ -131,7 +141,7 @@ msgstr "Lignes de commandes de %s"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End date is in the next month"
-msgstr ""
+msgstr "La date de fin est dans le prochain mois"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -212,7 +222,7 @@ msgstr "Attendu"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Closed contracts"
-msgstr ""
+msgstr "Contrats terminés"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -245,7 +255,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Liste de prix"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
@@ -636,7 +646,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress (open, draft)"
-msgstr ""
+msgstr "Contrats en cours (ouvert, brouillon)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -661,6 +671,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Vous trouverez ici les feuilles de temps et les achats que "
+"vous avez effectué pour\n"
+"                des contrats que vous pouvez refacturer à un client. Pour\n"
+"                enregistrer de nouvelles activités à facturer, utiliser "
+"plutôt le menu de \n"
+"                des feuilles de temps à la place.\n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0

addons/account_analytic_analysis/i18n/pt_BR.po

@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-18 19:35+0000\n"
-"Last-Translator: Claudio de Araujo Santos <claudioaraujosantos@gmail.com>\n"
+"PO-Revision-Date: 2014-03-07 00:27+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@zupy.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:56+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:23+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -51,7 +52,7 @@ msgstr "Restante"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr "Taxa Real de Margem"
+msgstr "Taxa Real de Margem (%)"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0

addons/account_analytic_analysis/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-19 20:53+0000\n"
+"PO-Revision-Date: 2014-03-07 06:40+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\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-20 05:33+0000\n"
-"X-Generator: Launchpad (build 16872)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 "Language: tr\n"
 
 #. module: account_analytic_analysis
@@ -212,7 +212,7 @@ msgstr "Hesap Temsilcisi"
 #: help:account.analytic.account,remaining_hours_to_invoice:0
 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
 msgstr ""
-"Hesaplamada kullanılan formül:Maksimum Zaman - Toplam faturalandırılan Zaman"
+"Hesaplamada kullanılan formül:Maksimum Zaman - Toplam faturalanan Zaman"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -222,7 +222,7 @@ msgstr "Beklenen"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Closed contracts"
-msgstr "Kapalı sözleşmeler"
+msgstr "Kapanan sözleşmeler"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -355,22 +355,22 @@ msgstr "Ay"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr "Faturalanacak Zaman & Malzemeler"
+msgstr "Faturalanacak Zaman&Malzemeler"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr "Başlangıç Tarihi"
+msgstr "Başlanma Tarihi"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expiring soon"
-msgstr "Yakında bitiyor"
+msgstr "Süresi dolmak üzere"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoiced"
-msgstr "Faturalandı"
+msgstr "Faturalanan"
 
 #. module: account_analytic_analysis
 #: model:email.template,body_html:account_analytic_analysis.account_analytic_cron_email_template
@@ -516,7 +516,7 @@ msgstr "Zaman Çizelgeleri"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Closed"
-msgstr "Kapandı"
+msgstr "Kapanan"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -699,7 +699,7 @@ msgstr "Faturalanmış Toplam"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "In Progress"
-msgstr "Sürüyor"
+msgstr "Devam Eden"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0

addons/account_analytic_plans/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-19 21:07+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-03-07 06:40+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\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-20 05:33+0000\n"
-"X-Generator: Launchpad (build 16872)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 "Language: tr\n"
 
 #. module: account_analytic_plans
@@ -96,7 +96,7 @@ msgstr "Plan No"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
 msgid "Analytic Distribution's Models"
-msgstr "Analitik dağıtımın modelleri"
+msgstr "Analitik Dağıtımın Modelleri"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -106,7 +106,7 @@ msgstr "Hesap Adı"
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr "Analitik dağılım kalemi"
+msgstr "Analitik Dağılım Kalemi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
@@ -149,7 +149,7 @@ msgstr "ya da"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Analitik kalem"
+msgstr "Analitik Kalem"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -259,7 +259,7 @@ msgstr "Analitik Plan Kalemleri"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr "İzin verilen en az (%)"
+msgstr "İzin Verilen en az (%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
@@ -382,7 +382,7 @@ msgstr "Hiç analitik plan tanımlanmamış."
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr "Banka ekstresi"
+msgstr "Banka Ekstresi"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -430,7 +430,7 @@ msgstr "Vazgeç"
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
 msgid "Start Date"
-msgstr "Başlangıç Tarihi"
+msgstr "Başlanma Tarihi"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0

addons/account_asset/i18n/id.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-11 08:50+0000\n"
+"Last-Translator: williamlsd <mudy@tdmm.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -27,27 +27,27 @@ msgstr ""
 #: field:account.asset.history,method_end:0
 #: field:asset.modify,method_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Tanggal akhir"
 
 #. module: account_asset
 #: field:account.asset.asset,value_residual:0
 msgid "Residual Value"
-msgstr ""
+msgstr "Nilai residual"
 
 #. module: account_asset
 #: field:account.asset.category,account_expense_depreciation_id:0
 msgid "Depr. Expense Account"
-msgstr ""
+msgstr "Depr Akun Biaya"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Dikelompokan berdasarkan ..."
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
 msgid "Gross Amount"
-msgstr ""
+msgstr "Jumlah Kotor"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -58,7 +58,7 @@ msgstr ""
 #: field:asset.asset.report,asset_id:0
 #: model:ir.model,name:account_asset.model_account_asset_asset
 msgid "Asset"
-msgstr ""
+msgstr "Aktiva"
 
 #. module: account_asset
 #: help:account.asset.asset,prorata:0
@@ -67,12 +67,14 @@ msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
 "from the purchase date instead of the first January"
 msgstr ""
+"Mengindikasikan bahwa entri depresiasi pertama untuk aset ini harus "
+"dilakukan dari tanggal pembelian, bukan dari tanggal satu Januari."
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
 #: selection:account.asset.category,method:0
 msgid "Linear"
-msgstr ""
+msgstr "Linier"
 
 #. module: account_asset
 #: field:account.asset.asset,company_id:0
@@ -85,19 +87,19 @@ msgstr "Perusahaan"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Modify"
-msgstr ""
+msgstr "Ubah"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 #: view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Running"
-msgstr ""
+msgstr "Sedang berjalan"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Atur menjadi draft"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -105,24 +107,24 @@ msgstr ""
 #: model:ir.model,name:account_asset.model_asset_asset_report
 #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
 msgid "Assets Analysis"
-msgstr ""
+msgstr "Analisa Aset"
 
 #. module: account_asset
 #: field:asset.modify,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Alasan"
 
 #. module: account_asset
 #: field:account.asset.asset,method_progress_factor:0
 #: field:account.asset.category,method_progress_factor:0
 msgid "Degressive Factor"
-msgstr ""
+msgstr "Faktor Penurunan Nilai"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
 msgid "Asset Categories"
-msgstr ""
+msgstr "Kategori Aset"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -130,40 +132,40 @@ msgstr ""
 #: field:account.move.line,entry_ids:0
 #: model:ir.actions.act_window,name:account_asset.act_entries_open
 msgid "Entries"
-msgstr ""
+msgstr "Entri"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 #: field:account.asset.asset,depreciation_line_ids:0
 msgid "Depreciation Lines"
-msgstr ""
+msgstr "Baris Depresiasi"
 
 #. module: account_asset
 #: help:account.asset.asset,salvage_value:0
 msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr ""
+msgstr "Adalah besaran yang anda rencanakan yang tidak dapat di depresiasi."
 
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "Waktu antara dua depresiasi, dalam bulan"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0
 #: field:asset.asset.report,depreciation_date:0
 msgid "Depreciation Date"
-msgstr ""
+msgstr "Tanggal Depresiasi"
 
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Salah ! Anda tidak dapat membuat aset rekursif"
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
 msgid "Posted Amount"
-msgstr ""
+msgstr "Jumlah terposting"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -173,12 +175,12 @@ msgstr ""
 #: model:ir.ui.menu,name:account_asset.menu_finance_assets
 #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
-msgstr ""
+msgstr "Aset"
 
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
 msgid "Depreciation Account"
-msgstr ""
+msgstr "Akun Depresiasi"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -187,34 +189,34 @@ msgstr ""
 #: view:asset.modify:0
 #: field:asset.modify,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Catatan"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_id:0
 msgid "Depreciation Entry"
-msgstr ""
+msgstr "Entri Depresiasi"
 
 #. module: account_asset
 #: code:addons/account_asset/account_asset.py:82
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ada Kesalahan !"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 #: field:asset.asset.report,nbr:0
 msgid "# of Depreciation Lines"
-msgstr ""
+msgstr "# Baris Depresiasi"
 
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Jumlah Bulan dalam Satu Periode"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr ""
+msgstr "Aset pada kondisi draft"
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -222,37 +224,37 @@ msgstr ""
 #: selection:account.asset.category,method_time:0
 #: selection:account.asset.history,method_time:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Tanggal Akhir"
 
 #. module: account_asset
 #: field:account.asset.asset,code:0
 msgid "Reference"
-msgstr ""
+msgstr "Referensi"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Account Asset"
-msgstr ""
+msgstr "Akun Aset"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
 #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
 msgid "Compute Assets"
-msgstr ""
+msgstr "Hitung Aset"
 
 #. module: account_asset
 #: field:account.asset.category,method_period:0
 #: field:account.asset.history,method_period:0
 #: field:asset.modify,method_period:0
 msgid "Period Length"
-msgstr ""
+msgstr "Lama Periode"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 #: view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Draft"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -262,24 +264,24 @@ msgstr "Tanggal pembelian aset"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
-msgstr ""
+msgstr "Ubah Durasi"
 
 #. module: account_asset
 #: help:account.asset.asset,method_number:0
 #: help:account.asset.category,method_number:0
 #: help:account.asset.history,method_number:0
 msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
+msgstr "Jumlah depresiasi yang dibutuhkan untuk mendepresiasi aset anda"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Informasi Analitik"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Akun Analitik"
 
 #. module: account_asset
 #: field:account.asset.asset,method:0
@@ -297,24 +299,24 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Periode Depresiasi Berikutnya"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
 msgid "Time in month between two depreciations"
-msgstr ""
+msgstr "Waktu dalam bulan antara dua depresiasi"
 
 #. module: account_asset
 #: view:asset.modify:0
 #: model:ir.actions.act_window,name:account_asset.action_asset_modify
 #: model:ir.model,name:account_asset.model_asset_modify
 msgid "Modify Asset"
-msgstr ""
+msgstr "Ubah Aktiva"
 
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
 msgid "Salvage Value"
-msgstr ""
+msgstr "Nilai Likuidasi Aset"
 
 #. module: account_asset
 #: field:account.asset.asset,category_id:0
@@ -322,68 +324,68 @@ msgstr ""
 #: field:account.invoice.line,asset_category_id:0
 #: view:asset.asset.report:0
 msgid "Asset Category"
-msgstr ""
+msgstr "Kategori Aktiva"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr ""
+msgstr "Aktiva pada kondisi tertutup"
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
 msgid "Parent Asset"
-msgstr ""
+msgstr "Aktiva induk"
 
 #. module: account_asset
 #: view:account.asset.history:0
 #: model:ir.model,name:account_asset.model_account_asset_history
 msgid "Asset history"
-msgstr ""
+msgstr "Histori Aktiva"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Search Asset Category"
-msgstr ""
+msgstr "Cari Kategori Aktiva"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "months"
-msgstr ""
+msgstr "bulan"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Baris Tagihan"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation Board"
-msgstr ""
+msgstr "Papan Depresiasi"
 
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
-msgstr ""
+msgstr "Jumlah Belum Terposting"
 
 #. module: account_asset
 #: field:account.asset.asset,method_time:0
 #: field:account.asset.category,method_time:0
 #: field:account.asset.history,method_time:0
 msgid "Time Method"
-msgstr ""
+msgstr "Metode Waktu"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "atau"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
 #: field:account.asset.category,note:0
 #: field:account.asset.history,note:0
 msgid "Note"
-msgstr ""
+msgstr "Catatan"
 
 #. module: account_asset
 #: help:account.asset.history,method_time:0
@@ -394,6 +396,12 @@ msgid ""
 "Ending Date: Choose the time between 2 depreciations and the date the "
 "depreciations won't go beyond."
 msgstr ""
+"Metode yang digunakan untuk menghitung tanggal dan angka pada baris "
+"depresiasi.\n"
+"Angka Depresiasi: Angka tetap dari baris depresiasi dan waktu antara 2 "
+"depresiasi.\n"
+"Tanggal Akhir: Pilih waktu antara 2 depresiasi dimana tanggal depresiasi "
+"tidak melebihinya."
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -406,16 +414,22 @@ msgid ""
 "  * Ending Date: Choose the time between 2 depreciations and the date the "
 "depreciations won't go beyond."
 msgstr ""
+"Pilih metode untuk digunakan untuk menghitung tanggal dan jumlah baris "
+"depresiasi.\n"
+"  * Jumlah Depresiasi: Angkat baris depresiasi tetap dan waktu antara 2 "
+"depresiasi.\n"
+"  * Tanggal Akhir: Pilih waktu antara 2 depresiasi dan tanggal depresiasi "
+"tidak boleh melebihinya."
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr ""
+msgstr "Aktiva pada kondisi berjalan"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Closed"
-msgstr ""
+msgstr "Ditutup"
 
 #. module: account_asset
 #: help:account.asset.asset,state:0
@@ -426,43 +440,48 @@ msgid ""
 "You can manually close an asset when the depreciation is over. If the last "
 "line of depreciation is posted, the asset automatically goes in that status."
 msgstr ""
+"Saat aktiva dibuat, statusnya adalah 'Draft'.\n"
+"Jika aktiva di konfirmasi, statusnya menjadi 'Berjalan' dan baris depresiasi "
+"dapat di posting pada pembukuan.\n"
+"Anda dapat menutup secara manual suatu aktiva saat depresiasi sudah "
+"berakhir. Jika baris akhir depresiasi dimasukkan, aktiva otomatis tertutup."
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
 #: field:asset.asset.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Posted depreciation lines"
-msgstr ""
+msgstr "Baris depresiasi terposting"
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr ""
+msgstr "Aktiva anak"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of depreciation"
-msgstr ""
+msgstr "Tanggal depresiasi"
 
 #. module: account_asset
 #: field:account.asset.history,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Pengguna"
 
 #. module: account_asset
 #: field:account.asset.category,account_asset_id:0
 msgid "Asset Account"
-msgstr ""
+msgstr "Akun Aktiva"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -473,17 +492,17 @@ msgstr "Filter Tambahan..."
 #: view:account.asset.asset:0
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute"
-msgstr ""
+msgstr "Hitung"
 
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "Histori Aktiva"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
-msgstr ""
+msgstr "wizard.konfirmasi.depresiasi.aktiva"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
@@ -493,12 +512,12 @@ msgstr "Aktif"
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
 msgid "State of Asset"
-msgstr ""
+msgstr "Status Aktiva"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,name:0
 msgid "Depreciation Name"
-msgstr ""
+msgstr "Nama Depresiasi"
 
 #. module: account_asset
 #: view:account.asset.asset:0

addons/account_asset/i18n/it.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-22 14:16+0000\n"
-"Last-Translator: Sergio Corato <Unknown>\n"
+"PO-Revision-Date: 2014-03-06 12:29+0000\n"
+"Last-Translator: Davide Corio @ LS <davide.corio@lsweb.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:23+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -200,7 +200,7 @@ msgstr "Riga Ammortamento"
 #: code:addons/account_asset/account_asset.py:82
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Errore!"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -614,6 +614,8 @@ msgstr "Attivi"
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
+"Non puoi eliminare un'immobilizzazione che contiene linee di deprezzamento "
+"confermate."
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -753,7 +755,7 @@ msgstr "Movimenti Immobilizzazioni Creati"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Add an internal note here..."
-msgstr ""
+msgstr "Aggiungi una nota interna ..."
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0

addons/account_budget/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-15 17:41+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-03-07 06:40+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\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-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 "Language: tr\n"
 
 #. module: account_budget
@@ -96,7 +96,7 @@ msgstr "Bütçeleri Yazdır"
 #. module: account_budget
 #: report:account.budget:0
 msgid "Currency:"
-msgstr "Döviz:"
+msgstr "Para Birimi:"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
@@ -116,7 +116,7 @@ msgstr "Yüzde"
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr "Durum"
+msgstr "Durumu"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -218,7 +218,7 @@ msgstr "Yüzde(%)"
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Done"
-msgstr "Bitti"
+msgstr "Biten"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -434,7 +434,7 @@ msgstr "İptal"
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr "Baş. Tarihi"
+msgstr "Başlama Tarihi"
 
 #. module: account_budget
 #: report:account.budget:0

addons/account_cancel/i18n/id.po

@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-11 08:23+0000\n"
+"Last-Translator: williamlsd <mudy@tdmm.net>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Batalkan Tagihan"
 
 #~ msgid "Cancel"
 #~ msgstr "Batal"

addons/account_check_writing/account_voucher.py

@@ -41,6 +41,23 @@ class account_voucher(osv.osv):
         'number': fields.char('Number', size=32),
     }
 
+    def _amount_to_text(self, cr, uid, amount, currency_id, context=None):
+        # Currency complete name is not available in res.currency model
+        # Exceptions done here (EUR, USD, BRL) cover 75% of cases
+        # For other currencies, display the currency code
+        currency = self.pool['res.currency'].browse(cr, uid, currency_id, context=context)
+        if currency.name.upper() == 'EUR':
+            currency_name = 'Euro'
+        elif currency.name.upper() == 'USD':
+            currency_name = 'Dollars'
+        elif currency.name.upper() == 'BRL':
+            currency_name = 'reais'
+        else:
+            currency_name = currency.name
+        #TODO : generic amount_to_text is not ready yet, otherwise language (and country) and currency can be passed
+        #amount_in_word = amount_to_text(amount, context=context)
+        return amount_to_text(amount, currency=currency_name)
+
     def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
         """ Inherited - add amount_in_word and allow_check_writting in returned value dictionary """
         if not context:
@@ -48,22 +65,7 @@ class account_voucher(osv.osv):
         default = super(account_voucher, self).onchange_amount(cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=context)
         if 'value' in default:
             amount = 'amount' in default['value'] and default['value']['amount'] or amount
-
-            # Currency complete name is not available in res.currency model
-            # Exceptions done here (EUR, USD, BRL) cover 75% of cases
-            # For other currencies, display the currency code
-            currency = self.pool['res.currency'].browse(cr, uid, currency_id, context=context)
-            if currency.name.upper() == 'EUR':
-                currency_name = 'Euro'
-            elif currency.name.upper() == 'USD':
-                currency_name = 'Dollars'
-            elif currency.name.upper() == 'BRL':
-                currency_name = 'reais'
-            else:
-                currency_name = currency.name
-            #TODO : generic amount_to_text is not ready yet, otherwise language (and country) and currency can be passed
-            #amount_in_word = amount_to_text(amount, context=context)
-            amount_in_word = amount_to_text(amount, currency=currency_name)
+            amount_in_word = self._amount_to_text(cr, uid, amount, currency_id, context=context)
             default['value'].update({'amount_in_word':amount_in_word})
             if journal_id:
                 allow_check_writing = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context).allow_check_writing
@@ -92,6 +94,19 @@ class account_voucher(osv.osv):
                 },
             'nodestroy': True
             }
+    def create(self, cr, uid, vals, context=None):
+        if vals.get('amount') and vals.get('journal_id') and 'amount_in_word' not in vals:
+            vals['amount_in_word'] = self._amount_to_text(cr, uid, vals['amount'], vals.get('currency_id') or \
+                self.pool['account.journal'].browse(cr, uid, vals['journal_id'], context=context).currency.id or \
+                self.pool['res.company'].browse(cr, uid, vals['company_id']).currency_id.id, context=context)
+        return super(account_voucher, self).create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('amount') and vals.get('journal_id') and 'amount_in_word' not in vals:
+            vals['amount_in_word'] = self._amount_to_text(cr, uid, vals['amount'], vals.get('currency_id') or \
+                self.pool['account.journal'].browse(cr, uid, vals['journal_id'], context=context).currency.id or \
+                self.pool['res.company'].browse(cr, uid, vals['company_id']).currency_id.id, context=context)
+        return super(account_voucher, self).write(cr, uid, ids, vals, context=context)
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         """

addons/account_check_writing/i18n/nl.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-25 14:36+0000\n"
+"PO-Revision-Date: 2014-03-10 20:45+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-11 06:08+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -25,7 +25,7 @@ msgstr "Cheque boven"
 #. module: account_check_writing
 #: report:account.print.check.top:0
 msgid "Open Balance"
-msgstr "Open balans"
+msgstr "Openstaand bedrag"
 
 #. module: account_check_writing
 #: view:account.check.write:0

addons/account_followup/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-04-13 18:34+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2014-03-07 06:40+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -366,7 +366,7 @@ msgstr "En Kötü Vade Tarihi"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr "Dava açılmamış"
+msgstr "ihtilaflı olmayan"
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -582,7 +582,7 @@ msgstr "Yazılı Mesaj"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Responsible of credit collection"
-msgstr "Kredi toplama sorumlusu"
+msgstr "Alacak toplama sorumlusu"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:155
@@ -936,7 +936,7 @@ msgstr " eposta(lar) Gönderilmiş olmalı, ancak "
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr "Günlük Öğeleri"
+msgstr "Yevmiye Öğeleri"
 
 #. module: account_followup
 #: code:addons/account_followup/account_followup.py:280
@@ -968,7 +968,7 @@ msgstr "Bir Eposta Gönder"
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr "Borç"
+msgstr "Alacak"
 
 #. module: account_followup
 #: field:res.partner,payment_amount_overdue:0
@@ -1200,7 +1200,7 @@ msgstr "İzleme Eylemi"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr "Davalı olarak işaretli günlük girişlerini içerir"
+msgstr "İhtilaflı olarak işaretli yevmiye girişlerini içerir"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0

addons/account_payment/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-30 12:58+0000\n"
+"PO-Revision-Date: 2014-03-07 06:40+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-01 05:45+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -57,7 +57,7 @@ msgstr "Uygulanacak Ödeme Şeklini Seç"
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr "Grupla..."
+msgstr "Grupla İle..."
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -137,12 +137,12 @@ msgstr "Hata!"
 #: report:payment.order:0
 #: view:payment.order:0
 msgid "Amount"
-msgstr "Miktar"
+msgstr "Tutar"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr "Şirket Para Biriminde Toplam"
+msgstr "Şirket Para Birimi ile Toplam"
 
 #. module: account_payment
 #: selection:payment.order,state:0
@@ -344,7 +344,7 @@ msgstr "Ödenecek tutar"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr "Para birimi"
+msgstr "Para Birimi"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -489,7 +489,7 @@ msgstr "Ödeme Tutarı"
 #. module: account_payment
 #: field:payment.line,amount:0
 msgid "Amount in Company Currency"
-msgstr "Firma Para Biriminde Tutar"
+msgstr "Firma Para Birimi ile Tutar"
 
 #. module: account_payment
 #: help:payment.line,partner_id:0
@@ -613,7 +613,7 @@ msgstr "Ödemeleri Onayla"
 #: field:payment.line,company_currency:0
 #: report:payment.order:0
 msgid "Company Currency"
-msgstr "Firma Dövizi"
+msgstr "Firma Para Birimi"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main_payment
@@ -660,7 +660,7 @@ msgstr "Giriş Bilgisi"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
 msgid "payment.order.create"
-msgstr "ödeme.emir.oluştur"
+msgstr "payment.order.create"
 
 #. module: account_payment
 #: field:payment.line,order_id:0
@@ -681,7 +681,7 @@ msgstr "Toplam"
 #: code:addons/account_payment/wizard/account_payment_order.py:112
 #, python-format
 msgid "Entry Lines"
-msgstr "Kayıt Kalemleri"
+msgstr "Giriş Kalemleri"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0

addons/account_sequence/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-03-07 06:41+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:59+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -140,7 +140,7 @@ msgstr ""
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_sequence_installer
 msgid "account.sequence.installer"
-msgstr "hesap.dizi.kurucu"
+msgstr "account.sequence.installer"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_journal

addons/account_voucher/i18n/nl.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-19 09:56+0000\n"
+"PO-Revision-Date: 2014-03-10 20:43+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-20 05:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-11 06:08+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -488,7 +488,7 @@ msgid ""
 "At the operation date, the exchange rate was\n"
 "%s = %s"
 msgstr ""
-"Op de verwerkingsdatum, was de valutakoer\n"
+"Op de verwerkingsdatum, was de valutakoers\n"
 "%s = %s"
 
 #. module: account_voucher
@@ -1359,7 +1359,7 @@ msgstr "Relatie"
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr "Open balans"
+msgstr "Openstaand bedrag"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1106

addons/account_voucher/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-24 13:53+0000\n"
+"PO-Revision-Date: 2014-03-07 06:40+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-25 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -78,7 +78,7 @@ msgstr "Fatura Ödeme"
 #: 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 "Girişleri İçeaktar"
+msgstr "Girişleri İçe aktar"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -133,7 +133,7 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr "SatışTemsilcisi"
+msgstr "Satış Temsilcisi"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -841,7 +841,7 @@ msgstr "Haziran"
 #. module: account_voucher
 #: field:account.voucher,payment_rate_currency_id:0
 msgid "Payment Rate Currency"
-msgstr "Ödeme Para Birimi"
+msgstr "Ödeme Para Birimi Kuru"
 
 #. module: account_voucher
 #: field:account.voucher,paid:0
@@ -957,7 +957,7 @@ msgstr "Müşteri Ödemeleri"
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipts Analysis"
-msgstr "Satış Makbuzları Analizi"
+msgstr "Satış Makbuz Analizi"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -1004,7 +1004,7 @@ msgstr "Muhasebe Fişi"
 #. module: account_voucher
 #: field:account.voucher,number:0
 msgid "Number"
-msgstr "Sayı"
+msgstr "Numara"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -1337,7 +1337,7 @@ msgstr "Vergisi Tutar"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_sale_receipt_report
 msgid "Sales Receipt Statistics"
-msgstr "Satış Makbuzları İstatistikleri"
+msgstr "Satış Makbuz İstatistikleri"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1351,7 +1351,7 @@ msgstr "İş Ortağı"
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr "Bilanço Aç"
+msgstr "Açık Bakiye"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1106

addons/audittrail/audittrail.py

@@ -466,14 +466,12 @@ class audittrail_objects_proxy(object_proxy):
             # if at least one modification has been found
             for model_id, resource_id in lines:
                 line_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, model_id).model
-                name = pool.get(line_model).name_get(cr, uid, [resource_id])[0][1]
 
                 vals = {
                     'method': method,
                     'object_id': model_id,
                     'user_id': uid,
                     'res_id': resource_id,
-                    'name': name,
                 }
                 if (model_id, resource_id) not in old_values and method not in ('copy', 'read'):
                     # the resource was not existing so we are forcing the method to 'create'
@@ -484,7 +482,11 @@ class audittrail_objects_proxy(object_proxy):
                     # the resource is not existing anymore so we are forcing the method to 'unlink'
                     # (because it could also come with the value 'write' if we are deleting the
                     #  record through a one2many field)
+                    name = old_values[(model_id, resource_id)]['value'].get('name',False)
                     vals.update({'method': 'unlink'})
+                else :
+                    name = pool[line_model].name_get(cr, uid, [resource_id])[0][1]
+                vals.update({'name': name})
                 # create the audittrail log in super admin mode, only if a change has been detected
                 if lines[(model_id, resource_id)]:
                     log_id = pool.get('audittrail.log').create(cr, SUPERUSER_ID, vals)

addons/base_calendar/base_calendar.py

@@ -1626,6 +1626,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
 
     def _set_recurrency_end_date(self, data, context=None):
         end_date = data.get('end_date')
+        rel_date = False
         if data.get('recurrency') and data.get('end_type') in ('count', unicode('count')):
             data_date_deadline = datetime.strptime(data.get('date_deadline'), '%Y-%m-%d %H:%M:%S')
             if data.get('rrule_type') in ('daily', unicode('count')):
@@ -1636,7 +1637,9 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                 rel_date = relativedelta(months=data.get('count')+1)
             elif data.get('rrule_type') in ('yearly', unicode('yearly')):
                 rel_date = relativedelta(years=data.get('count')+1)
-            end_date = data_date_deadline + rel_date
+            end_date = data_date_deadline
+            if rel_date:
+                end_date += rel_date
         return end_date
 
     def create(self, cr, uid, vals, context=None):

addons/base_calendar/base_calendar_view.xml

@@ -161,8 +161,7 @@
                     <page string="Recurrency Option" attrs="{'invisible': [('recurrency','=',False)]}">
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
-                                <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_id','!=',False)]}"/>
+                                <field name="rrule_type" string="Recurrency period" />
                                 <field name="interval"/>
                                 <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type"/>

addons/base_import/__openerp__.py

@@ -32,6 +32,7 @@ Re-implement openerp's file import system:
     ],
     'css': [
         'static/lib/select2/select2.css',
+        # TODO for trunk: add select2-bootstrap.css style (to download)
         'static/src/css/import.css',
     ],
     'js': [

addons/base_import/static/lib/select2/LICENSE

@@ -1,12 +1,18 @@
 Copyright 2012 Igor Vaynberg
- 
+
 Version: @@ver@@ Timestamp: @@timestamp@@
 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
-compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
+General Public License version 2 (the "GPL License"). You may choose either license to govern your
+use of this software only upon the condition that you accept all of the terms of either the Apache
+License or the GPL License.
+
+You may obtain a copy of the Apache License and the GPL License at:
 
 http://www.apache.org/licenses/LICENSE-2.0
+http://www.gnu.org/licenses/gpl-2.0.html
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the Apache License
+or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied. See the Apache License and the GPL License for the specific language governing
+permissions and limitations under the Apache License and the GPL License.

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

@@ -1,39 +1,49 @@
 Select2
-=================
+=======
 
-Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results. Look and feel of Select2 is based on the excellent [Chosen](http://harvesthq.github.com/chosen/) library.
+Select2 is a jQuery-based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.
 
-To get started -- checkout http://ivaynberg.github.com/select2!
+To get started, checkout examples and documentation at http://ivaynberg.github.com/select2
 
-What Does Select2 Support That Chosen Does Not?
--------------------------------------------------
+Use cases
+---------
 
-* Working with large datasets: Chosen requires the entire dataset to be loaded as `option` tags in the DOM, which limits
-it to working with small-ish datasets. Select2 uses a function to find results on-the-fly, which allows it to partially
-load results.
-* Paging of results: Since Select2 works with large datasets and only loads a small amount of matching results at a time
-it has to support paging. Select2 will call the search function when the user scrolls to the bottom of currently loaded
-result set allowing for the 'infinite scrolling' of results.
-* Custom markup for results: Chosen only supports rendering text results because that is the only markup supported by
-`option` tags. Select2 provides an extension point which can be used to produce any kind of markup to represent results.
-* Ability to add results on the fly: Select2 provides the ability to add results from the search term entered by the user, which allows it to be used for
-tagging.
+* Enhancing native selects with search.
+* Enhancing native selects with a better multi-select interface.
+* Loading data from JavaScript: easily load items via ajax and have them searchable.
+* Nesting optgroups: native selects only support one level of nested. Select2 does not have this restriction.
+* Tagging: ability to add new items on the fly.
+* Working with large, remote datasets: ability to partially load a dataset based on the search term.
+* Paging of large datasets: easy support for loading more pages when the results are scrolled to the end.
+* Templating: support for custom rendering of results and selections.
 
-Browser Compatibility
---------------------
-* IE 8+ (7 mostly works except for [issue with z-index](https://github.com/ivaynberg/select2/issues/37))
+Browser compatibility
+---------------------
+* IE 8+
 * Chrome 8+
-* Firefox 3.5+
+* Firefox 10+
 * Safari 3+
 * Opera 10.6+
 
 Integrations
 ------------
 
-* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / Apache Wicket)
+* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / [Apache Wicket](http://wicket.apache.org))
 * [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails)
 * [AngularUI](http://angular-ui.github.com/#directives-select2) ([AngularJS](angularjs.org))
 * [Django](https://github.com/applegrew/django-select2)
+* [Symfony](https://github.com/19Gerhard85/sfSelect2WidgetsPlugin)
+* [Bootstrap](https://github.com/t0m/select2-bootstrap-css) (CSS skin)
+* [Yii](https://github.com/tonybolzan/yii-select2)
+
+Internationalization (i18n)
+---------------------------
+
+Select2 supports multiple languages by simply including the right
+language JS file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.).
+
+Missing a language? Just copy `select2_locale_en.js.template`, translate
+it, and make a pull request back to Select2 here on GitHub.
 
 Bug tracker
 -----------
@@ -42,7 +52,6 @@ Have a bug? Please create an issue here on GitHub!
 
 https://github.com/ivaynberg/select2/issues
 
-
 Mailing list
 ------------
 
@@ -53,16 +62,22 @@ select2@googlegroups.com
 https://groups.google.com/d/forum/select2
 
 
-Copyright and License
+Copyright and license
 ---------------------
 
 Copyright 2012 Igor Vaynberg
 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
-compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
+General Public License version 2 (the "GPL License"). You may choose either license to govern your
+use of this software only upon the condition that you accept all of the terms of either the Apache
+License or the GPL License.
+
+You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at:
 
 http://www.apache.org/licenses/LICENSE-2.0
+http://www.gnu.org/licenses/gpl-2.0.html
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the Apache License
+or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied. See the Apache License and the GPL License for the specific language governing
+permissions and limitations under the Apache License and the GPL License.

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

@@ -15,21 +15,33 @@ js="$name.js"
 mini="$name.min.js"
 css="$name.css"
 release="$name-$ver"
-releasedir="/tmp/$release"
-tag="release-$ver"
+tag="$ver"
 branch="build-$ver"
 curbranch=`git branch | grep "*" | sed "s/* //"`
 timestamp=$(date)
 tokens="s/@@ver@@/$ver/g;s/\@@timestamp@@/$timestamp/g"
 remote="github"
 
+echo "Pulling from origin"
+
+git pull
+
+echo "Updating Version Identifiers"
+
+sed -E -e "s/\"version\": \"([0-9\.]+)\",/\"version\": \"$ver\",/g" -i "" bower.json select2.jquery.json
+git add bower.json
+git add select2.jquery.json
+git commit -m "modified version identifiers in descriptors for release $ver"
+git push
+ 
 git branch "$branch"
 git checkout "$branch"
 
 echo "Tokenizing..."
 
-find . -name "$js" | xargs sed -i -e "$tokens"
-find . -name "$css" | xargs sed -i -e "$tokens"
+find . -name "$js" | xargs -I{} sed -e "$tokens" -i "" {} 
+find . -name "$css" | xargs -I{} sed -e "$tokens" -i "" {}
+sed -e "s/latest/$ver/g" -i "" bower.json
 
 git add "$js"
 git add "$css"
@@ -41,11 +53,8 @@ cat LICENSE | sed "$tokens" >> "$mini"
 echo "*/" >> "$mini"
 
 curl -s \
-	-d compilation_level=SIMPLE_OPTIMIZATIONS \
-	-d output_format=text \
-	-d output_info=compiled_code \
 	--data-urlencode "js_code@$js" \
-	http://closure-compiler.appspot.com/compile \
+	http://marijnhaverbeke.nl/uglifyjs \
 	>> "$mini"
 
 git add "$mini"
@@ -53,25 +62,12 @@ git add "$mini"
 git commit -m "release $ver"
 
 echo "Tagging..."
-
 git tag -a "$tag" -m "tagged version $ver"
 git push "$remote" --tags
 
-echo "Archiving..."
-
-rm -rf "$releasedir"
-mkdir "$releasedir"
-
-cp $name.* "$releasedir"
-cp spinner.gif "$releasedir"
-cp README.* "$releasedir"
-
-zip -r "$releasedir.zip" "$releasedir"
-rm -rf "$releasedir"
-
 echo "Cleaning Up..."
 
 git checkout "$curbranch"
 git branch -D "$branch"
 
-echo "Done. Release archive created: $releasedir.zip"
+echo "Done"

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

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

addons/base_import/static/lib/select2/select2.jquery.json

@@ -0,0 +1,36 @@
+{
+    "name": "select2",
+    "title": "Select2",
+    "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
+    "keywords": [
+        "select",
+        "autocomplete",
+        "typeahead",
+        "dropdown",
+        "multiselect",
+        "tag",
+        "tagging"
+    ],
+    "version": "3.4.5",
+    "author": {
+        "name": "Igor Vaynberg",
+        "url": "https://github.com/ivaynberg"
+    },
+    "licenses": [
+        {
+            "type": "Apache",
+            "url": "http://www.apache.org/licenses/LICENSE-2.0"
+        },
+        {
+            "type": "GPL v2",
+            "url": "http://www.gnu.org/licenses/gpl-2.0.html"
+        }
+    ],
+    "bugs": "https://github.com/ivaynberg/select2/issues",
+    "homepage": "http://ivaynberg.github.com/select2",
+    "docs": "http://ivaynberg.github.com/select2/",
+    "download": "https://github.com/ivaynberg/select2/tags",
+    "dependencies": {
+        "jquery": ">=1.7.1"
+    }
+}

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

@@ -482,5 +482,13 @@ openerp.base_import = function (instance) {
             { name: 'import_succeeded', from: 'importing', to: 'imported'},
             { name: 'import_failed', from: 'importing', to: 'results' }
         ]
-    })
+    });
+
+    $.extend($.fn.select2.defaults, {
+        formatNoMatches: function () { return _t("No matches found"); },
+        formatLoadMore: function (pageNumber) { return _t("Loading more results..."); },
+        formatSearching: function () { return _t("Searching..."); }
+    });
+
 };
+

addons/crm/crm_lead.py

@@ -440,7 +440,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         for lead in self.browse(cr, uid, ids):
             stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 0.0),('on_change','=',True)], context=context)
             if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 0.0}, new_stage_id=stage_id, context=context)
+                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 0.0, 'date_closed': fields.datetime.now()}, new_stage_id=stage_id, context=context)
         return True
 
     def case_mark_won(self, cr, uid, ids, context=None):
@@ -448,7 +448,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         for lead in self.browse(cr, uid, ids):
             stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0),('on_change','=',True)], context=context)
             if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 100.0}, new_stage_id=stage_id, context=context)
+                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 100.0, 'date_closed': fields.datetime.now()}, new_stage_id=stage_id, context=context)
         return True
 
     def set_priority(self, cr, uid, ids, priority):
@@ -926,11 +926,14 @@ class crm_lead(base_stage, format_address, osv.osv):
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
-        if vals.get('stage_id') and not vals.get('probability'):
-            # change probability of lead(s) if required by stage
+        if vals.get('stage_id'):
             stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
-            if stage.on_change:
+            if not vals.get('probability') and stage.on_change:
+                # change probability of lead(s) if required by stage
                 vals['probability'] = stage.probability
+            # set closed date when won or lost
+            if not vals.get('date_closed') and (vals.get('probability', 0) >= 100 or stage.state == 'canceled'):
+                vals['date_closed'] = fields.datetime.now()
         return super(crm_lead, self).write(cr, uid, ids, vals, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):

addons/crm/crm_phonecall_menu.xml

@@ -58,7 +58,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="domain">[]</field>
-        <field name="context">{'default_state': 'done'}</field>
+        <field name="context">{'search_default_state': 'done', 'default_state': 'done'}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">

addons/crm/crm_phonecall_view.xml

@@ -178,6 +178,7 @@
             <search string="Search Phonecalls">
                <field name="name" string="Phonecalls"/>
                <field name="date"/>
+               <field name="state"/>
                <separator/>
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
                <separator/>

addons/crm/i18n/ja.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-07 16:56+0000\n"
-"PO-Revision-Date: 2014-03-04 04:18+0000\n"
+"PO-Revision-Date: 2014-03-05 21:13+0000\n"
 "Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 08:26+0000\n"
+"X-Launchpad-Export-Date: 2014-03-06 06:14+0000\n"
 "X-Generator: Launchpad (build 16948)\n"
 
 #. module: crm
@@ -1594,6 +1594,8 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"選択されたステージに関する文書のステータスは自動で変更されます。例えば、ステージが「閉じる」に関連する場合、このステージに到達すると文書は自動で閉じられま"
+"す。"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0

addons/crm/i18n/pt_BR.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-01-07 16:56+0000\n"
-"PO-Revision-Date: 2013-07-18 19:53+0000\n"
-"Last-Translator: Claudio de Araujo Santos <claudioaraujosantos@gmail.com>\n"
+"PO-Revision-Date: 2014-03-07 00:11+0000\n"
+"Last-Translator: Cloves Almeida <cjalmeida@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-08 05:39+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:24+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -737,7 +737,7 @@ msgstr "Segmentação de Parceiros"
 #: code:addons/crm/crm_lead.py:1064
 #, python-format
 msgid "Logged a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "Registrada uma ligação em %(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
@@ -3132,7 +3132,7 @@ msgstr "Indicado por"
 #: code:addons/crm/crm_lead.py:1066
 #, python-format
 msgid "Scheduled a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "Agendada uma ligação para %(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0

addons/delivery/i18n/it.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-03 22:45+0000\n"
-"Last-Translator: Sergio Corato <Unknown>\n"
+"PO-Revision-Date: 2014-03-07 13:39+0000\n"
+"Last-Translator: Leonardo Donelli <learts92@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -576,7 +576,7 @@ msgstr "Prezzo di Vendita"
 #. module: delivery
 #: view:stock.picking.out:0
 msgid "Print Delivery Order"
-msgstr "Stampa ordine consegna"
+msgstr "Stampa Ordine di Consegna"
 
 #. module: delivery
 #: view:delivery.grid:0

addons/event/report/report_event_registration.py

@@ -58,7 +58,7 @@ class report_event_registration(osv.osv):
         # TOFIX this request won't select events that have no registration
         cr.execute(""" CREATE VIEW report_event_registration AS (
             SELECT
-                e.id::char || '/' || coalesce(r.id::char,'') AS id,
+                e.id::varchar || '/' || coalesce(r.id::varchar,'') AS id,
                 e.id AS event_id,
                 e.user_id AS user_id,
                 r.user_id AS user_id_registration,

addons/hr_expense/hr_expense.py

@@ -261,6 +261,10 @@ class hr_expense_expense(osv.osv):
 
             #convert eml into an osv-valid format
             lines = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.employee_id.address_home_id, exp.date_confirm, context=context)), eml)
+            journal_id = move_obj.browse(cr, uid, move_id, context).journal_id
+            # post the journal entry if 'Skip 'Draft' State for Manual Entries' is checked
+            if journal_id.entry_posted:
+                move_obj.button_validate(cr, uid, [move_id], context)
             move_obj.write(cr, uid, [move_id], {'line_id': lines}, context=context)
             self.write(cr, uid, ids, {'account_move_id': move_id, 'state': 'done'}, context=context)
         return True

addons/hr_expense/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-21 02:49+0000\n"
+"PO-Revision-Date: 2014-03-08 05:28+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-22 07:32+0000\n"
-"X-Generator: Launchpad (build 16926)\n"
+"X-Launchpad-Export-Date: 2014-03-09 06:02+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -544,7 +544,7 @@ msgstr "草案"
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Paid"
-msgstr ""
+msgstr "支払済"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:353
@@ -676,7 +676,7 @@ msgstr "交通費"
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Submit to Manager"
-msgstr "上長に申請"
+msgstr "マネジャーに申請"
 
 #. module: hr_expense
 #: view:hr.expense.report:0

addons/hr_payroll_account/hr_payroll_account.py

@@ -24,7 +24,7 @@ from openerp import netsvc
 from datetime import date, datetime, timedelta
 
 from openerp.osv import fields, osv
-from openerp.tools import config
+from openerp.tools import config, float_compare
 from openerp.tools.translate import _
 
 class hr_payslip(osv.osv):
@@ -87,6 +87,7 @@ class hr_payslip(osv.osv):
     def process_sheet(self, cr, uid, ids, context=None):
         move_pool = self.pool.get('account.move')
         period_pool = self.pool.get('account.period')
+        precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Payroll')
         timenow = time.strftime('%Y-%m-%d')
 
         for slip in self.browse(cr, uid, ids, context=context):
@@ -151,7 +152,7 @@ class hr_payslip(osv.osv):
                     line_ids.append(credit_line)
                     credit_sum += credit_line[2]['credit'] - credit_line[2]['debit']
 
-            if debit_sum > credit_sum:
+            if float_compare(credit_sum, debit_sum, precision_digits=precision) == -1:
                 acc_id = slip.journal_id.default_credit_account_id.id
                 if not acc_id:
                     raise osv.except_osv(_('Configuration Error!'),_('The Expense Journal "%s" has not properly configured the Credit Account!')%(slip.journal_id.name))
@@ -167,7 +168,7 @@ class hr_payslip(osv.osv):
                 })
                 line_ids.append(adjust_credit)
 
-            elif debit_sum < credit_sum:
+            elif float_compare(debit_sum, credit_sum, precision_digits=precision) == -1:
                 acc_id = slip.journal_id.default_debit_account_id.id
                 if not acc_id:
                     raise osv.except_osv(_('Configuration Error!'),_('The Expense Journal "%s" has not properly configured the Debit Account!')%(slip.journal_id.name))

addons/hr_timesheet/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-21 02:40+0000\n"
+"PO-Revision-Date: 2014-03-08 06:18+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-22 07:32+0000\n"
-"X-Generator: Launchpad (build 16926)\n"
+"X-Launchpad-Export-Date: 2014-03-09 06:02+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -53,7 +53,7 @@ msgstr "水曜日"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "(Keep empty for current_time)"
-msgstr "（現在、空白）"
+msgstr "(現在時刻を適用する場合は空白)"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -133,7 +133,7 @@ msgstr "タイムシート活動明細"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr "最小分析アカウント"
+msgstr "最小分析数（時/日）"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -143,7 +143,7 @@ msgstr "月間従業員作業表"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Work done in the last period"
-msgstr "前期の完了作業"
+msgstr "今回行った作業"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,name:0
@@ -341,7 +341,7 @@ msgstr "月"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,info:0
 msgid "Work Description"
-msgstr "作業記述"
+msgstr "作業内容"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -349,7 +349,7 @@ msgstr "作業記述"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "or"
-msgstr "or"
+msgstr "または"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
@@ -365,7 +365,7 @@ msgstr "従業員勤務表"
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
 msgid "Sign in / Sign out by project"
-msgstr "プロジェクトごとのサインイン / サインアウト"
+msgstr "プロジェクト勤怠"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
@@ -452,7 +452,7 @@ msgstr "11月"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
 msgid "Closing Date"
-msgstr "締切日"
+msgstr "終了日"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:41
@@ -640,7 +640,7 @@ msgstr "4月"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "ユーザエラー"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -672,4 +672,4 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Change Work"
-msgstr "作業の変更"
+msgstr "作業更新"

addons/hr_timesheet_sheet/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-27 23:31+0000\n"
-"Last-Translator: Yoshi Tashiro <yostashiro@gmail.com>\n"
+"PO-Revision-Date: 2014-03-08 05:25+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-28 06:06+0000\n"
-"X-Generator: Launchpad (build 16847)\n"
+"X-Launchpad-Export-Date: 2014-03-09 06:03+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -771,7 +771,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submit to Manager"
-msgstr ""
+msgstr "マネジャーに申請"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0

addons/l10n_multilang/l10n_multilang.py

@@ -137,7 +137,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
     def _process_taxes_translations(self, cr, uid, obj_multi, company_id, langs, field, context=None):
         obj_tax_template = self.pool.get('account.tax.template')
         obj_tax = self.pool.get('account.tax')
-        in_ids = sorted([x.id for x in obj_multi.chart_template_id.tax_template_ids])
+        in_ids = [x.id for x in obj_multi.chart_template_id.tax_template_ids]
         out_ids = obj_tax.search(cr, uid, [('company_id', '=', company_id)], order='id')
         return self.process_translations(cr, uid, langs, obj_tax_template, field, in_ids, obj_tax, out_ids, context=context)
 

addons/mail/wizard/invite.py

@@ -73,7 +73,7 @@ class invite_wizard(osv.osv_memory):
                     mail_id = mail_mail.create(cr, uid, {
                         'model': wizard.res_model,
                         'res_id': wizard.res_id,
-                        'subject': 'Invitation to follow %s' % document.name_get()[0][1],
+                        'subject': _('Invitation to follow %s') % document.name_get()[0][1],
                         'body_html': '%s' % wizard.message,
                         'auto_delete': True,
                         }, context=context)

addons/membership/membership_demo.xml

@@ -6,7 +6,7 @@
     <record id="membership_0" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
+        <field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
         <field name="name">Golden Membership</field>
         <field name="list_price">180</field>
         <field name="categ_id" ref="product.product_category_1"/>
@@ -16,7 +16,7 @@
     <record id="membership_1" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
+        <field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
         <field name="name">Silver Membership</field>
         <field name="categ_id" ref="product.product_category_1"/>
         <field name="list_price">80</field>
@@ -26,7 +26,7 @@
     <record id="membership_2" model="product.product">
         <field name="membership">True</field>
         <field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
-        <field eval="time.strftime('%Y-12-01')" name="membership_date_to"/>
+        <field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
         <field name="name">Basic Membership</field>
         <field name="categ_id" ref="product.product_category_1"/>
         <field name="list_price">40</field>

addons/mrp/i18n/ja.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-18 07:45+0000\n"
-"Last-Translator: Yoshi Tashiro <yostashiro@gmail.com>\n"
+"PO-Revision-Date: 2014-03-07 05:43+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-19 05:40+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:54+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -672,7 +672,7 @@ msgstr "この製品のための部品表が定義されていません。"
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr "構成部品の部品表"
+msgstr "部品表構成品"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
@@ -1961,7 +1961,7 @@ msgstr "集荷の再作成"
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Order"
-msgstr "注文中"
+msgstr "オーダ"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration

addons/mrp/mrp.py

@@ -30,6 +30,7 @@ from openerp.tools.translate import _
 from openerp import netsvc
 from openerp import tools
 from openerp import SUPERUSER_ID
+from openerp.addons.product import _common
 
 #----------------------------------------------------------
 # Work Centers
@@ -324,7 +325,7 @@ class mrp_bom(osv.osv):
         """
         routing_obj = self.pool.get('mrp.routing')
         factor = factor / (bom.product_efficiency or 1.0)
-        factor = rounding(factor, bom.product_rounding)
+        factor = _common.ceiling(factor, bom.product_rounding)
         if factor < bom.product_rounding:
             factor = bom.product_rounding
         result = []
@@ -380,6 +381,8 @@ class mrp_bom(osv.osv):
 
 
 def rounding(f, r):
+    # TODO for trunk: log deprecation warning
+    # _logger.warning("Deprecated rounding method, please use tools.float_round to round floats.")
     import math
     if not r:
         return f

addons/mrp_repair/__openerp__.py

@@ -56,7 +56,8 @@ The following topics should be covered by this module:
              'test/test_mrp_repair_b4inv.yml',
              'test/test_mrp_repair_afterinv.yml',
              'test/test_mrp_repair_cancel.yml',
-             'test/mrp_repair_report.yml'
+             'test/mrp_repair_report.yml',
+             'test/test_mrp_repair_fee.yml',
     ],
     'installable': True,
     'auto_install': False,

addons/mrp_repair/i18n/fr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-10-23 08:18+0000\n"
-"Last-Translator: Florian Hatat <Unknown>\n"
+"PO-Revision-Date: 2014-03-07 18:04+0000\n"
+"Last-Translator: Lionel Sausin - Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:54+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -377,7 +377,7 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
 msgid "Pricelist"
-msgstr "Liste de Prix"
+msgstr "Liste de prix"
 
 #. module: mrp_repair
 #: field:mrp.repair,quotation_notes:0

addons/mrp_repair/mrp_repair.py

@@ -109,10 +109,12 @@ class mrp_repair(osv.osv):
         return res
 
     def _get_lines(self, cr, uid, ids, context=None):
-        result = {}
-        for line in self.pool.get('mrp.repair.line').browse(cr, uid, ids, context=context):
-            result[line.repair_id.id] = True
-        return result.keys()
+        return self.pool['mrp.repair'].search(
+            cr, uid, [('operations', 'in', ids)], context=context)
+
+    def _get_fee_lines(self, cr, uid, ids, context=None):
+        return self.pool['mrp.repair'].search(
+            cr, uid, [('fees_lines', 'in', ids)], context=context)
 
     _columns = {
         'name': fields.char('Repair Reference',size=24, required=True, states={'confirmed':[('readonly',True)]}),
@@ -161,18 +163,21 @@ class mrp_repair(osv.osv):
         'repaired': fields.boolean('Repaired', readonly=True),
         'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount',
             store={
-                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
+                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations', 'fees_lines'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
+                'mrp.repair.fee': (_get_fee_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
         'amount_tax': fields.function(_amount_tax, string='Taxes',
             store={
-                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
+                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations', 'fees_lines'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
+                'mrp.repair.fee': (_get_fee_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
         'amount_total': fields.function(_amount_total, string='Total',
             store={
-                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations'], 10),
+                'mrp.repair': (lambda self, cr, uid, ids, c={}: ids, ['operations', 'fees_lines'], 10),
                 'mrp.repair.line': (_get_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
+                'mrp.repair.fee': (_get_fee_lines, ['price_unit', 'price_subtotal', 'product_id', 'tax_id', 'product_uom_qty', 'product_uom'], 10),
             }),
     }
 

addons/mrp_repair/test/test_mrp_repair_fee.yml

@@ -0,0 +1,23 @@
+-
+  Testing total amount update function
+-
+  I check the total amount of mrp_repair_rmrp1 is 100
+-
+  !assert {model: mrp.repair, id: mrp_repair_rmrp1, string=amount_total should be 100}:
+    - amount_total == 100
+-
+  I add a new fee line
+-
+  !record {model: mrp.repair, id: mrp_repair_rmrp1}:
+    fees_lines:
+      - name: 'Assembly Service Cost'
+        product_id: product.product_assembly
+        product_uom_qty: 1.0
+        product_uom: product.product_uom_hour
+        price_unit: 12.0
+        to_invoice: True
+-
+  I check the total amount of mrp_repair_rmrp1 is now 112
+-
+  !assert {model: mrp.repair, id: mrp_repair_rmrp1, string=amount_total should be 112}:
+    - amount_total == 112

addons/portal/mail_message.py

@@ -35,14 +35,14 @@ class mail_message(osv.Model):
         """
         if uid == SUPERUSER_ID:
             return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
-                context=context, count=False, access_rights_uid=access_rights_uid)
+                context=context, count=count, access_rights_uid=access_rights_uid)
         group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
         group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
         if group_user_id not in [group.id for group in group_ids]:
             args = ['&', '|', ('type', '!=', 'comment'), ('subtype_id', '!=', False)] + list(args)
 
         return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
-            context=context, count=False, access_rights_uid=access_rights_uid)
+            context=context, count=count, access_rights_uid=access_rights_uid)
 
     def check_access_rule(self, cr, uid, ids, operation, context=None):
         """ Add Access rules of mail.message for non-employee user:

addons/product/__openerp__.py

@@ -61,7 +61,6 @@ Print product labels with barcode.
     ],
     'test': [
         'product_pricelist_demo.yml',
-        'test/product_uom.yml',
         'test/product_pricelist.yml',
     ],
     'installable': True,

addons/product/_common.py

@@ -18,12 +18,18 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
+from openerp import tools
+
+import math
+
+
 def rounding(f, r):
+	# TODO for trunk: log deprecation warning
+	# _logger.warning("Deprecated rounding method, please use tools.float_round to round floats.")
+	return tools.float_round(f, precision_rounding=r)
+
+# TODO for trunk: add rounding method parameter to tools.float_round and use this method as hook
+def ceiling(f, r):
     if not r:
         return f
-    return round(f / r) * r
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+    return math.ceil(f / r) * r

addons/product/i18n/hr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2014-02-20 11:43+0000\n"
-"Last-Translator: Mihael Murkovic <Unknown>\n"
+"PO-Revision-Date: 2014-03-05 10:27+0000\n"
+"Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-21 06:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-06 06:14+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -735,7 +735,7 @@ msgstr ""
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr "Količina na raspolaganju"
+msgstr "Fizička zaliha"
 
 #. module: product
 #: field:product.price.type,name:0

addons/product/i18n/it.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-22 14:43+0000\n"
-"Last-Translator: Davide Corio <enlightx@gmail.com>\n"
+"PO-Revision-Date: 2014-03-06 10:33+0000\n"
+"Last-Translator: Leonardo Donelli <learts92@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:26+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:24+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -700,9 +700,9 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
-"Quando una versione è dupplicata, impostare non attivo, in modo che i dati "
-"non sovrascrivano la versione originale. Cambiare le date e riattivare il "
-"Listino"
+"Quando una versione è duplicata viene impostato non attivo, in modo che i "
+"dati non sovrascrivano la versione originale. Cambiare le date e riattivare "
+"il Listino."
 
 #. module: product
 #: model:product.template,name:product.product_product_18_product_template
@@ -1105,7 +1105,7 @@ msgid ""
 "Product Unit of Measure if not empty, in the default unit of measure of the "
 "product otherwise."
 msgstr ""
-"La quantità minima per gli acquisti da questo fornitore, expressa nell'unità "
+"La quantità minima per gli acquisti da questo fornitore, espressa nell'unità "
 "di misura del fornitore se specificata, altrimenti nell'unità di misura di "
 "default del prodotto."
 
@@ -1737,7 +1737,7 @@ 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 ""
-"La quatità minima per attivare questa regola, espressa nell'unità di misura "
+"La quantità minima per attivare questa regola, espressa nell'unità di misura "
 "del fornitore se valorizzata o altrimenti nell'unità di misura di default "
 "del prodotto."
 

addons/product/pricelist.py

@@ -21,8 +21,7 @@
 
 import time
 
-from _common import rounding
-
+from openerp import tools
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
@@ -296,7 +295,8 @@ class product_pricelist(osv.osv):
                         if price is not False:
                             price_limit = price
                             price = price * (1.0+(res['price_discount'] or 0.0))
-                            price = rounding(price, res['price_round']) #TOFIX: rounding with tools.float_rouding
+                            if res['price_round']:
+                                price = tools.float_round(price, precision_rounding=res['price_round'])
                             price += (res['price_surcharge'] or 0.0)
                             if res['price_min_margin']:
                                 price = max(price, price_limit+res['price_min_margin'])

addons/product/product.py

@@ -22,7 +22,7 @@
 import math
 import re
 
-from _common import rounding
+from _common import ceiling
 
 from openerp import tools
 from openerp.osv import osv, fields
@@ -178,7 +178,7 @@ class product_uom(osv.osv):
                 return qty
         amount = qty / from_unit.factor
         if to_unit:
-            amount = rounding(amount * to_unit.factor, to_unit.rounding)
+            amount = ceiling(amount * to_unit.factor, to_unit.rounding)
         return amount
 
     def _compute_price(self, cr, uid, from_uom_id, price, to_uom_id=False):

addons/product/product_view.xml

@@ -182,7 +182,6 @@
                 <kanban>
                     <field name="color"/>
                     <field name="type"/>
-                    <field name="image_small"/>
                     <field name="list_price"/>
                     <templates>
                         <t t-name="kanban-box">

addons/product/test/product_uom.yml

@@ -1,15 +0,0 @@
--
-  In order to test conversation of UOM,
--
-  I convert Grams into TON with price.
--
-  !python {model: product.uom}: |
-    from_uom_id = ref("product_uom_gram")
-    to_uom_id = ref("product_uom_ton")
-    price = 2
-    qty = 1020000
-    price = self._compute_price(cr, uid, from_uom_id, price, to_uom_id)
-    qty = self._compute_qty(cr, uid, from_uom_id, qty, to_uom_id)
-    assert qty == 1.02, "Qty is not correspond."
-    assert price == 2000000.0, "Price is not correspond."
-

addons/product/tests/__init__.py

@@ -0,0 +1,5 @@
+from . import test_uom
+
+fast_suite = [
+	test_uom,
+]

addons/product/tests/test_uom.py

@@ -0,0 +1,37 @@
+from openerp.tests.common import TransactionCase
+
+class TestUom(TransactionCase):
+    """Tests for unit of measure conversion"""
+
+    def setUp(self):
+        super(TestUom, self).setUp()
+        self.product = self.registry('product.product')
+        self.uom = self.registry('product.uom')
+        self.imd = self.registry('ir.model.data')
+
+    def test_10_conversion(self):
+        cr, uid = self.cr, self.uid
+        gram_id = self.imd.get_object_reference(cr, uid, 'product', 'product_uom_gram')[1]
+        tonne_id = self.imd.get_object_reference(cr, uid, 'product', 'product_uom_ton')[1]
+
+        qty = self.uom._compute_qty(cr, uid, gram_id, 1020000, tonne_id)
+        self.assertEquals(qty, 1.02, "Converted quantity does not correspond.")
+
+        price = self.uom._compute_price(cr, uid, gram_id, 2, tonne_id)
+        self.assertEquals(price, 2000000.0, "Converted price does not correspond.")
+
+    def test_20_rounding(self):
+        cr, uid = self.cr, self.uid
+        unit_id = self.imd.get_object_reference(cr, uid, 'product', 'product_uom_unit')[1]
+        categ_unit_id = self.imd.get_object_reference(cr, uid, 'product', 'product_uom_categ_unit')[1]
+        
+        score_id = self.uom.create(cr, uid, {
+            'name': 'Score',
+            'factor_inv': 20,
+            'uom_type': 'bigger',
+            'rounding': 1.0,
+            'category_id': categ_unit_id
+        })
+
+        qty = self.uom._compute_qty(cr, uid, unit_id, 2, score_id)
+        self.assertEquals(qty, 1, "Converted quantity should be rounded up.")

addons/product_margin/product_margin.py

@@ -53,9 +53,9 @@ class product_product(osv.osv):
                 states = ('draft', 'open', 'paid')
 
             sqlstr="""select
-                    sum(l.price_unit * l.quantity)/sum(l.quantity) as avg_unit_price,
+                    sum(l.price_unit * l.quantity)/sum(nullif(l.quantity,0)) as avg_unit_price,
                     sum(l.quantity) as num_qty,
-                    sum(l.quantity * (l.price_subtotal/l.quantity)) as total,
+                    sum(l.quantity * (l.price_subtotal/(nullif(l.quantity,0)))) as total,
                     sum(l.quantity * pt.list_price) as sale_expected,
                     sum(l.quantity * pt.standard_price) as normal_cost
                 from account_invoice_line l

addons/project/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-28 21:53+0000\n"
+"PO-Revision-Date: 2014-03-06 09:20+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-29 05:30+0000\n"
-"X-Generator: Launchpad (build 16847)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:24+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: project
 #: view:project.project:0
@@ -46,12 +46,12 @@ msgstr "Yetkiye göre görev"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr "Ana"
+msgstr "Üst"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr "Projedeki görevler"
+msgstr "Proje görevleri"
 
 #. module: project
 #: field:project.task.type,name:0
@@ -77,7 +77,7 @@ msgstr "Gün"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
-msgstr "Birleştir"
+msgstr "Birleştirme"
 
 #. module: project
 #: view:res.partner:0
@@ -114,7 +114,7 @@ msgstr "Yanlış"
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr "Deneniyor"
+msgstr "Test"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
@@ -146,12 +146,12 @@ msgstr "Uyarı!"
 #. module: project
 #: model:ir.model,name:project.model_res_partner
 msgid "Partner"
-msgstr "Partner"
+msgstr "İş Ortağı"
 
 #. module: project
 #: field:project.config.settings,group_manage_delegation_task:0
 msgid "Allow task delegation"
-msgstr "Görev delegasyonu izinverme"
+msgstr "Görev delegasyonu izin verme"
 
 #. module: project
 #: field:project.task.delegate,planned_hours:0
@@ -277,7 +277,7 @@ msgstr "Proje Yönetimi"
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr "Prtoje Görevi Yetkilndirme"
+msgstr "Proje Görevi Yetkilndirme"
 
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_started
@@ -398,7 +398,7 @@ msgstr ""
 #: view:project.task:0
 #: view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr "DevamEden Görevler"
+msgstr "Devam Eden Görevler"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -438,7 +438,7 @@ msgstr "Proje Yöneticisi"
 #: selection:project.task.type,state:0
 #: selection:report.project.task.user,state:0
 msgid "In Progress"
-msgstr "DevamEden"
+msgstr "Devam Eden"
 
 #. module: project
 #: view:project.task:0
@@ -479,7 +479,7 @@ msgstr "Mesai saatlerinizi giriniz."
 #. module: project
 #: field:project.project,alias_id:0
 msgid "Alias"
-msgstr "TakmaAd"
+msgstr "Rumuz"
 
 #. module: project
 #: view:project.task:0
@@ -651,7 +651,7 @@ msgstr "Şablon Görev Değil"
 #. module: project
 #: field:project.task,planned_hours:0
 msgid "Initially Planned Hours"
-msgstr "Başlangıçta Planlanan Saat"
+msgstr "İlk Planlanan Saatler"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -708,7 +708,7 @@ msgstr "Planlama"
 #: field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "ZamanSınırı"
+msgstr "Zaman Sınırı"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -736,7 +736,7 @@ msgstr "Son Tarih"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr "Özellikler"
+msgstr "Tanımlama"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -757,7 +757,7 @@ msgstr "Yeni Görev Tanımı"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr "ZamanSınırını Aşan"
+msgstr "Zaman Sınırını Aşan"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -827,7 +827,7 @@ msgstr "Sil"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr "DevamEden"
+msgstr "Devam Eden"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -896,7 +896,7 @@ msgstr "Bir İzleyicidir"
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Biten iş"
+msgstr "Biten çalışma"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1114,7 +1114,7 @@ msgstr "Onay Durumu"
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr "İş Özeti"
+msgstr "Çalışma Özeti"
 
 #. module: project
 #: view:project.project:0
@@ -1427,7 +1427,7 @@ msgstr "Düşük"
 #. module: project
 #: selection:project.project,state:0
 msgid "Closed"
-msgstr "Kapandı"
+msgstr "Kapanan"
 
 #. module: project
 #: view:project.project:0
@@ -1523,7 +1523,7 @@ msgstr ""
 #: code:addons/project/project.py:230
 #, python-format
 msgid "Attachments"
-msgstr "Ekkler"
+msgstr "Ekler"
 
 #. module: project
 #: view:project.category:0
@@ -1545,7 +1545,7 @@ msgstr ""
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 #: view:project.project:0
 msgid "Open"
-msgstr "Aç"
+msgstr "Açık"
 
 #. module: project
 #: field:project.project,privacy_visibility:0
@@ -1700,7 +1700,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr "ZamanSınırı"
+msgstr "Zaman Sınırı"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -2029,7 +2029,7 @@ msgstr ""
 #. module: project
 #: model:project.category,name:project.project_category_03
 msgid "Experiment"
-msgstr "Deneyi"
+msgstr "Deneme"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -2235,7 +2235,7 @@ msgstr "Sıralama"
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr "Görev İşi"
+msgstr "Görev Çalışma"
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0

addons/purchase/i18n/mn.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-01 12:16+0000\n"
-"Last-Translator: gobi <Unknown>\n"
+"PO-Revision-Date: 2014-03-05 06:20+0000\n"
+"Last-Translator: Jacara <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-02 06:00+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-06 06:14+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -613,7 +613,8 @@ msgstr "Нийлүүлэгч"
 #: code:addons/purchase/purchase.py:527
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
-msgstr "Энэ компанийн дансны зардлыг тодоройлох: \"%s\" (id:%d)"
+msgstr ""
+"Энэ компанид бараа материалын данс тодорхойлогдоогүй байна: \"%s\" (id:%d)"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0

addons/purchase/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-24 13:48+0000\n"
+"PO-Revision-Date: 2014-03-05 10:43+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-25 06:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-06 06:14+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -489,7 +489,7 @@ msgstr "Para Birimi"
 #. module: purchase
 #: field:purchase.order,journal_id:0
 msgid "Journal"
-msgstr "Günlük"
+msgstr "Yevmiye"
 
 #. module: purchase
 #: view:board.board:0
@@ -909,7 +909,7 @@ msgstr "Bir İzleyicidir"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr "Aylık Toplam Mik ve Tutar"
+msgstr "Aylık Toplam Miktar ve Tutar"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -965,7 +965,7 @@ msgstr "Satınalma"
 #: view:purchase.report:0
 #: field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr "Doğrulanacak Günler"
+msgstr "Doğrulama Günler"
 
 #. module: purchase
 #: view:purchase.config.settings:0
@@ -1485,7 +1485,7 @@ msgstr "Satınalma Sipariş Kalemlerinden"
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr "TVA:"
+msgstr "KDV:"
 
 #. module: purchase
 #: help:purchase.order,picking_ids:0

addons/purchase/i18n/zh_CN.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-07 02:09+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
+"PO-Revision-Date: 2014-03-05 09:15+0000\n"
+"Last-Translator: mrshelly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:31+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-06 06:15+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -1291,7 +1291,7 @@ msgstr "3月"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Receive Invoice"
-msgstr "接收传票"
+msgstr "接收发票"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1599,7 +1599,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoice Received"
-msgstr "已收传票"
+msgstr "已收发票"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -2176,6 +2176,81 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>敬启 ${object.partner_id.name} ：</p>\n"
+"    \n"
+"    <p>您有一张  ${object.company_id.name} 公司的采购单 ${object.state in ('draft', "
+"'sent') and '需询价' or '需确认'} : </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>相关单据数据</strong><br />\n"
+"       &nbsp;&nbsp;采购单号: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;总金额: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;采购日期: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;单据参考: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;贵司参考: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.validator:\n"
+"       &nbsp;&nbsp;贵司相关人员: <a href=\"mailto:${object.validator.email or "
+"''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>如还有其他疑问，请及时联系我们。</p>\n"
+"    <p>谢谢</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                TEL:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: purchase
 #: selection:purchase.report,month:0

addons/sale/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-28 21:02+0000\n"
+"PO-Revision-Date: 2014-03-05 10:43+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-29 05:30+0000\n"
-"X-Generator: Launchpad (build 16847)\n"
+"X-Launchpad-Export-Date: 2014-03-06 06:15+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -501,8 +501,8 @@ msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
-"Satış temsilcisi teklifi onaylıyor. Satış Siparişinin durumu \"Sürüyor\" ya "
-"da \"Elle işlem sürüyor\" olur."
+"Satış temsilcisi teklifi onaylıyor. Satış Siparişinin durumu 'Sürüyor' ya da "
+"'Elle işlem sürüyor' olur."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -692,7 +692,7 @@ msgstr "Sipariş N°"
 #: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr "Sipariş Kalemleri"
+msgstr "Sipariş Satırları"
 
 #. module: sale
 #: field:account.config.settings,module_sale_analytic_plans:0
@@ -707,9 +707,9 @@ msgid ""
 "                and perform batch operations on journals.\n"
 "                This installs the module sale_journal."
 msgstr ""
-"Satışlarınızı ve teslimatlarınızı (toplama listeleri) değişik günlükler "
+"Satışlarınızı ve teslimatlarınızı (seçim listeleri) değişik yevmiyeler "
 "arasında sınıflandırmanızı sağlar,\n"
-"                günlükler üzerin toplu işlemler yürütür.\n"
+"                yevmiyeler üzerin toplu işlemler yürütür.\n"
 "                Bu, sale_journal modülünü kurar."
 
 #. module: sale
@@ -1013,7 +1013,7 @@ msgstr "Mik"
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
-msgstr "Satış Siparişi Kalemlerim"
+msgstr "Satış Siparişi Satırları"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -1070,8 +1070,8 @@ msgid ""
 "${object.company_id.name} ${object.state in ('draft', 'sent') and "
 "'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
 msgstr ""
-"${object.company_id.name} ${object.state in ('draft', 'sent') and "
-"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+"${object.company_id.name} ${object.state in ('draft', 'sent') and 'Teklif' "
+"or 'Sipariş'} (Ref ${object.name or 'n/a' })"
 
 #. module: sale
 #: report:sale.order:0
@@ -1147,7 +1147,7 @@ msgstr "Teklifin Yeni Kopyası"
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr "Satış Siparişi sayısı"
+msgstr "# Satış Siparişi"
 
 #. module: sale
 #: code:addons/sale/sale.py:983
@@ -1202,7 +1202,7 @@ msgstr "Faturalanacak Sipariş Kalemleri"
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr "Gruplandır..."
+msgstr "Gruplandır İle..."
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -1417,7 +1417,7 @@ msgstr "Tedarik ve faturalamayı yürütür"
 #. module: sale
 #: field:sale.order,invoiced:0
 msgid "Paid"
-msgstr "Ödenmiş"
+msgstr "Ödenmdi"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_report_all
@@ -1533,7 +1533,7 @@ msgstr "Yapılacaklar"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sales Order"
-msgstr "Satış Siparişi faturala"
+msgstr "Satış Siparişi Faturala"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1640,7 +1640,7 @@ msgstr ""
 "    <p>Sayın ${object.partner_id.name},</p>\n"
 "    \n"
 "    <p>Firmamız ${object.company_id.name}nden istemiş olduğunuz "
-"${object.state in ('draft', 'sent') and 'teklif' or 'Sipariş doğrulama'} "
+"${object.state in ('draft', 'sent') and 'Teklif' or 'Sipariş doğrulama'} "
 "aşağıdadır: </p>\n"
 "\n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
@@ -1855,7 +1855,7 @@ msgstr "Satış Paneli"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr "'tamamlandı' durumunda Satış Siparişi Kalemleri"
+msgstr "'biten' durumunda Satış Siparişi Kalemleri"
 
 #. module: sale
 #: help:sale.config.settings,module_account_analytic_analysis:0
@@ -2024,7 +2024,7 @@ msgstr "Onay Tarihi"
 #: code:addons/sale/sale.py:364
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr "Bu şirket için lütfen satış günlüğü oluşturun: \"%s\" (id:%d)."
+msgstr "Bu şirket için lütfen satış yevmiyesi oluşturun: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -2080,14 +2080,14 @@ msgstr "İzleyiciler"
 #. module: sale
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr "Fatura Kalemleri"
+msgstr "Fatura Satırları"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr "Satış Siparişi Kalemleri"
+msgstr "Satış Siparişi Satırları"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -2228,7 +2228,7 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 "Onaylı, yapıldı ya da istisna durumundaki ve henüz faturalanmamış Satış "
-"Siparişi Kalemleri"
+"Siparişi Satırları"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2279,7 +2279,7 @@ msgstr "Sipariş Durumu"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Show Lines to Invoice"
-msgstr "Faturalanacak Kalemleri Göster"
+msgstr "Faturalanacak Satırları Göster"
 
 #. module: sale
 #: field:sale.report,date:0
@@ -2433,7 +2433,7 @@ msgstr "Teklif N°"
 #. module: sale
 #: view:sale.report:0
 msgid "Picked"
-msgstr "Toplanmış"
+msgstr "Seçilmiş"
 
 #. module: sale
 #: view:sale.report:0

addons/share/i18n/zh_CN.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-01 16:12+0000\n"
-"Last-Translator: jeffery chen fan <jeffery9@gmail.com>\n"
+"PO-Revision-Date: 2014-03-06 08:55+0000\n"
+"Last-Translator: jack lee <liyupu@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:34+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:24+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:842
@@ -76,6 +76,8 @@ msgid ""
 "    %s\n"
 "\n"
 msgstr ""
+"附件没弄好，你可以在OpenERP服务器上查看: %s\n"
+"\n"
 
 #. module: share
 #: model:ir.module.category,name:share.module_category_share
@@ -147,7 +149,7 @@ msgstr "共享URL"
 #: code:addons/share/wizard/share_wizard.py:881
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
-msgstr ""
+msgstr "这是你访问这个保护区域的凭证：\n"
 
 #. module: share
 #: view:share.wizard:0
@@ -173,7 +175,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Please indicate the emails of the persons to share with, one per line."
-msgstr ""
+msgstr "请标明分享的用户电子邮箱，每行一个。"
 
 #. module: share
 #: help:share.wizard,domain:0
@@ -189,7 +191,7 @@ msgstr "下一个"
 #: code:addons/share/wizard/share_wizard.py:662
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
-msgstr ""
+msgstr "操作和访问模式都需要要创建一个共享入口。"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:850
@@ -282,7 +284,7 @@ msgstr "共享操作"
 #. module: share
 #: help:share.wizard,record_name:0
 msgid "Name of the shared record, if sharing a precise record"
-msgstr ""
+msgstr "如果共享一个精确记录，记录下分享名"
 
 #. module: share
 #: field:res.users,share:0

addons/stock/i18n/hr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2013-11-09 12:14+0000\n"
-"Last-Translator: Dejan Radočaj <Unknown>\n"
+"PO-Revision-Date: 2014-03-05 10:52+0000\n"
+"Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-07 07:12+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-06 06:15+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -778,7 +778,7 @@ msgstr "Additional Reference"
 #. module: stock
 #: view:stock.partial.picking.line:0
 msgid "Stock Picking Line"
-msgstr "Stavka primke"
+msgstr "Stavka skladišnog dokumenta"
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -1063,7 +1063,7 @@ msgstr "Budući P&L"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4
 #: view:stock.picking.in:0
 msgid "Incoming Shipments"
-msgstr "Primke"
+msgstr "Pošiljke u dolasku"
 
 #. module: stock
 #: help:stock.picking,date:0
@@ -3322,10 +3322,10 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                Pritisnite za kreiranje primke ovog proizvoda. \n"
+"                Pritisnite za kreiranje prijema ovog proizvoda. \n"
 "              </p><p>\n"
-"                Ovjde možete pronaći povijest svih primki povezanih sa\n"
-"                ovim proizvodom, kao i sve buduće primke koje očekujete\n"
+"                Ovjde možete pronaći povijest svih prijema povezanih sa\n"
+"                ovim proizvodom, kao i sve buduće prijeme koje očekujete\n"
 "                od Vaših dobavljača.\n"
 "              </p>\n"
 "            "
@@ -3954,7 +3954,7 @@ msgstr "Datumi inventura"
 #: model:ir.actions.act_window,name:stock.action_receive_move
 #: view:product.product:0
 msgid "Receptions"
-msgstr "Primke"
+msgstr "Prijemi"
 
 #. module: stock
 #: view:report.stock.move:0

addons/stock/i18n/it.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2013-01-09 21:34+0000\n"
-"Last-Translator: Sergio Corato <Unknown>\n"
+"PO-Revision-Date: 2014-03-07 13:39+0000\n"
+"Last-Translator: Leonardo Donelli <learts92@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-07 07:11+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-08 06:54+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -4922,7 +4922,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Print Delivery Slip"
-msgstr "Stampa Ordine di  Consegna"
+msgstr "Stampa Ordine di Prelievo"
 
 #. module: stock
 #: view:report.stock.inventory:0

addons/stock/i18n/ja.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-02-28 04:43+0000\n"
+"PO-Revision-Date: 2014-03-08 03:50+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-01 05:52+0000\n"
+"X-Launchpad-Export-Date: 2014-03-09 06:03+0000\n"
 "X-Generator: Launchpad (build 16948)\n"
 
 #. module: stock
@@ -920,7 +920,7 @@ msgstr "参照は会社ごとに固有でなければいけません。"
 #: code:addons/stock/product.py:448
 #, python-format
 msgid "Future Receptions"
-msgstr "将来の受取"
+msgstr "入荷予定"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -3325,7 +3325,7 @@ msgstr "請求書を生成したい場合は、集荷リストにパートナを
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Confirm & Receive"
-msgstr "確認と受取り"
+msgstr "確認して入荷"
 
 #. module: stock
 #: field:stock.picking,origin:0

addons/stock/i18n/nl.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-02-25 17:48+0000\n"
+"PO-Revision-Date: 2014-03-11 17:54+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-26 07:31+0000\n"
-"X-Generator: Launchpad (build 16935)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -92,7 +92,7 @@ msgstr "Terug traceren"
 #: field:stock.picking.in,date_done:0
 #: field:stock.picking.out,date_done:0
 msgid "Date of Transfer"
-msgstr "Datum van verzending"
+msgstr "Datum van verplaatsing"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -1122,7 +1122,7 @@ msgstr "Details"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Ready to Transfer"
-msgstr "Beschikbaar"
+msgstr "Gereed voor verplaatsing"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2113,7 +2113,7 @@ msgstr "Geleverd aantal"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Transfer Products"
-msgstr "Verzend producten"
+msgstr "Verplaats producten"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -2166,8 +2166,8 @@ msgstr ""
 "            * Wachten op beschikbaarheid: Nog wachtend op de beschikbaarheid "
 "van de producten\n"
 "\n"
-"            * Gereed voor leveren: Producten zijn gereserveerd, wachtend op "
-"bevestiging\n"
+"            * Gereed voor verplaatsing: Producten zijn gereserveerd, "
+"wachtend op bevestiging\n"
 "\n"
 "            * Verwerkt: Is verwerkt, kan niet meer worden aangepast of "
 "worden geannuleerd \n"
@@ -2430,7 +2430,8 @@ msgstr "Bedrag"
 #: field:stock.config.settings,module_stock_invoice_directly:0
 msgid "Create and open the invoice when the user finish a delivery order"
 msgstr ""
-"Maak en open de factuur wanneer de gebruiker klaar is met de uitgaande order"
+"Maak en open de factuur wanneer de gebruiker klaar is met de uitgaande "
+"levering"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -2729,7 +2730,7 @@ msgstr "Partijen"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "_Transfer"
-msgstr "_Doorverbinden"
+msgstr "_Verplaatsen"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3064,7 +3065,7 @@ msgstr "Voorraad rapport per partijnummer"
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Transfer"
-msgstr "Transfer annuleren"
+msgstr "Verplaatsing annuleren"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0

addons/stock/i18n/pt_BR.po

@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2013-07-18 20:54+0000\n"
-"Last-Translator: Claudio de Araujo Santos <claudioaraujosantos@gmail.com>\n"
+"PO-Revision-Date: 2014-03-07 00:14+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@zupy.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-07 07:13+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:24+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -1989,7 +1990,7 @@ msgstr "Conta de Valorização do Estoque (Saindo)"
 #: code:addons/stock/stock.py:1805
 #, python-format
 msgid "Operation Forbidden!"
-msgstr ""
+msgstr "Operação Proibida!"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form2
@@ -2763,6 +2764,8 @@ msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
 "rounding of \"%s %s\" is accepted by the Unit of Measure."
 msgstr ""
+"O Arredondamento da Unidade de Medida não permite o envio de \"%s %s\", "
+"apenas arredondamentos de \"%s %s\" são aceitos pela Unidade de Medida."
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -3923,6 +3926,9 @@ msgid ""
 "would let a quantity of \"%s %s\" to ship and only rounding of \"%s %s\" is "
 "accepted by the uom."
 msgstr ""
+"O Arredondamento da Unidade de Medida Inicial não permite o envio de \"%s "
+"%s\", pois deixará uma quantidade de \"%s %s\" para o envio e somente "
+"arredondamentos de \"%s %s\" são aceitos pela Udm"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
@@ -4265,6 +4271,7 @@ msgstr "Esta lista de separação não requer faturamento."
 msgid ""
 "You have manually created product lines, please delete them to proceed"
 msgstr ""
+"Você criou linha de produtos manualmente, por favor exclua-as para prosseguir"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
@@ -4325,7 +4332,7 @@ msgstr "Revisões de Número de Série"
 #: code:addons/stock/stock.py:1134
 #, python-format
 msgid "Error, no partner!"
-msgstr ""
+msgstr "Erro, sem parceiro associado!"
 
 #. module: stock
 #: view:stock.picking:0

addons/stock/i18n/tr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2013-11-30 14:39+0000\n"
+"PO-Revision-Date: 2014-03-05 10:43+0000\n"
 "Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-07 07:12+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-06 06:15+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr "Stok hareketi Bölünmüş satırları"
+msgstr "Stok hareketi Bölünmüş Satırları"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -52,7 +52,7 @@ msgid ""
 "product"
 msgstr ""
 "Gerçek-zamanlı envanter değerlendirmesi yaparken, gelen tüm stokların "
-"hareketlerine karşılık gelen ait öğe günlükleri bu hesaba işlenecektir, "
+"hareketlerine karşılık gelen ait öğe yevmiyeleri bu hesaba işlenecektir, "
 "kaynak konumda özel bir değerlendirme hesabı yoksa. Bu kategorideki ürünler "
 "için bu varsayılan değerdir. Her ürüne doğrudan da ayarlanabilir."
 
@@ -169,7 +169,7 @@ msgstr "Seçim listesi"
 #. module: stock
 #: view:stock.inventory:0
 msgid "e.g. Annual inventory"
-msgstr "Yıllık Sayım"
+msgstr "örn. Yıllık Sayım"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -387,7 +387,7 @@ msgstr "Uyarı!"
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
-msgstr "Grupla partner ile"
+msgstr "Grupla iş ortağı ile"
 
 #. module: stock
 #: help:stock.picking,move_type:0
@@ -407,7 +407,7 @@ msgstr "Aynı anda kısmen veya tüm teslim edilecek malların belirtir"
 #: field:stock.picking.in,partner_id:0
 #: field:stock.picking.out,partner_id:0
 msgid "Partner"
-msgstr "Partner"
+msgstr "İş Ortağı"
 
 #. module: stock
 #: field:stock.config.settings,module_claim_from_delivery:0
@@ -800,7 +800,7 @@ msgstr "İşlenmiş Envanterler"
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr "Ana Sihirbaz (varolan satırlar için="
+msgstr "Ana Sihirbaz (varolan satırlar için)"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -893,7 +893,7 @@ msgstr "Tedarik Konumu"
 #. module: stock
 #: view:stock.picking:0
 msgid "e.g. PO0032"
-msgstr "e.g. PO0032"
+msgstr "örn. PO0032"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
@@ -1177,7 +1177,7 @@ msgstr "Kabule Hazır"
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr "İcra Tamamlama Süresi (Gün)"
+msgstr "Uygulama Tamamlama Süresi (Gün)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
@@ -1397,7 +1397,7 @@ msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
 msgstr ""
-"Bu envanteri silmek için önce ilişkili günlük girişlerinin işlenmesini "
+"Bu envanteri silmek için önce ilişkili yevmiye girişlerinin işlenmesini "
 "kaldırmalısınız."
 
 #. module: stock
@@ -1534,11 +1534,11 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                Yeni bir günlük oluşturmak için tıklayın. \n"
+"                Yeni bir yevmiye oluşturmak için tıklayın. \n"
 "              </p><p>\n"
-"                Stok günlük sistemi her stok hareketini, yürütülecek \n"
+"                Stok yevmiye sistemi her stok hareketini, yürütülecek \n"
 "                işlemin ya da bu işlemi yürütecek işçi/takım türüne \n"
-"                göre belirli bir günlüğe atar. Stok günlüğü örnekleri \n"
+"                göre belirli bir yevmiyeye atar. Stok yevmiyesi örnekleri \n"
 "                şunlar olabilir: kalite kontrol, toplama listeleri,\n"
 "                paketleme, vb..\n"
 "\n"
@@ -1983,7 +1983,7 @@ msgstr "Stok Değerleme Hesabı (Çıkan)"
 #: code:addons/stock/stock.py:1805
 #, python-format
 msgid "Operation Forbidden!"
-msgstr ""
+msgstr "Operasyon Yasak!"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form2
@@ -2355,7 +2355,7 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for goods you receive from the current partner"
 msgstr ""
-"Mevcut ortaktan aldığınız malların kaynak lkonumu olarak varsayılan yerine "
+"Mevcut iş ortaktan aldığınız malların kaynak konumu olarak varsayılan yerine "
 "bu stok konumu kullanılacaktır"
 
 #. module: stock
@@ -2792,7 +2792,7 @@ msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
 "account on category of this product are same."
 msgstr ""
-"Günlük Kaydı oluşturulamıyor, Bu ürünün Çıkış Hesabı ve bu ürünün "
+"Yevmiye Kaydı oluşturulamıyor, Bu ürünün Çıkış Hesabı ve bu ürünün "
 "kategorisindeki Değerleme hesabı aynıdır."
 
 #. module: stock
@@ -2976,8 +2976,8 @@ msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
 "account on category of this product are same."
 msgstr ""
-"Günlük Kaydı oluşturulamıyor, Bu ürünün Giriş Hesabı ve bu ürünün "
-"kategorisindeki Değerleme hesabı aynıdır."
+"Yevmiye Kaydı oluşturulamıyor, Bu ürünün Giriş Hesabı ve bu ürünün "
+"kategorisindeki değerleme hesabı aynıdır."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
@@ -3895,6 +3895,9 @@ msgid ""
 "would let a quantity of \"%s %s\" to ship and only rounding of \"%s %s\" is "
 "accepted by the uom."
 msgstr ""
+"İlk UOM ve yuvarlama size sevk izin vermez \"%s %s\", olarakbir miktar bir "
+"izin istiyorsanız \"%s %s\" sevk ve sadece yuvarlama için \"%s %s\" olarak "
+"UOM tarafından kabuledilir."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
@@ -4140,7 +4143,7 @@ msgid ""
 "on each product"
 msgstr ""
 "Gerçek-zamanlı envanter değerlemesi yaparken, hedef konuma özel bir "
-"değerleme hesabı ayarlanmadıkça, çıkan tüm stok hareketlerinin günlük "
+"değerleme hesabı ayarlanmadıkça, çıkan tüm stok hareketlerinin yevmiye "
 "öğeleri bu hesaba işlenecektir. Bu, bu kategorideki tüm ürünler için "
 "varsayılan değerdir. Aynı zamanda her ürünü de doğrudan ayarlanabilir."
 
@@ -4218,7 +4221,7 @@ msgstr "Onaylanmış Teslimat Siparişleri"
 #: field:stock.partial.move,picking_id:0
 #: field:stock.partial.picking,picking_id:0
 msgid "Picking"
-msgstr "SeçimListesi"
+msgstr "Seçim Listesi"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4292,7 +4295,7 @@ msgstr "Seri Numarası Revizyonları"
 #: code:addons/stock/stock.py:1134
 #, python-format
 msgid "Error, no partner!"
-msgstr ""
+msgstr "Hata, hiç iş ortağı yok!"
 
 #. module: stock
 #: view:stock.picking:0
@@ -4937,7 +4940,7 @@ msgstr "Önek"
 #: view:stock.move:0
 #: view:stock.move.split:0
 msgid "Split in Serial Numbers"
-msgstr "Seri Numaralarına Göre ayır"
+msgstr "Seri Numaralarına Göre Ayır"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -4948,7 +4951,7 @@ msgid ""
 "product, the one from the product category is used."
 msgstr ""
 "Gerçek zamanlı envanter değerlemesi yaparken, gelen bütün stok "
-"hareketlerinin karşıt günlük maddeleri, kaynak konumda özel bir değerleme "
+"hareketlerinin karşıt yevmiye maddeleri, kaynak konumda özel bir değerleme "
 "hesabı tanımlanıncaya kadar bu hesaba işlenecektir. Ürüne tanımlanmamışsa, "
 "ürün kategorisinden bir tane kullanılır."
 

addons/stock/i18n/zh_TW.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-02-14 11:58+0000\n"
+"PO-Revision-Date: 2014-03-11 08:04+0000\n"
 "Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-15 07:37+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-12 05:26+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -3323,6 +3323,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                點擊增加一個追蹤號碼。\n"
+"              </p><p>\n"
+"                這是您所有的包裹清單。當您選擇一個「包裹」，\n"
+"                即可讀取這個包裹內含產品的上下游追溯資料。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: code:addons/stock/stock.py:2545
@@ -3406,7 +3413,7 @@ msgstr "已排程"
 #. module: stock
 #: view:stock.picking:0
 msgid "Add an internal note..."
-msgstr ""
+msgstr "增加一個內部備註"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3417,26 +3424,26 @@ msgstr "倉庫"
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "負責人"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Process Entirely"
-msgstr ""
+msgstr "全部處理"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by procurements."
-msgstr ""
+msgstr "此倉位將會替代預設倉位，用在因採購而產生的庫存調動的來源倉位。"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "庫存分析"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -3453,7 +3460,7 @@ msgstr "庫存"
 #: code:addons/stock/wizard/stock_return_picking.py:226
 #, python-format
 msgid "Returned Picking"
-msgstr ""
+msgstr "退貨提貨"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
@@ -3503,33 +3510,33 @@ msgstr ""
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Return"
-msgstr ""
+msgstr "退貨"
 
 #. module: stock
 #: field:stock.return.picking,invoice_state:0
 msgid "Invoicing"
-msgstr ""
+msgstr "發票開立"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "指定的內部調動"
 
 #. module: stock
 #: code:addons/stock/stock.py:804
 #, python-format
 msgid "You cannot process picking without stock moves."
-msgstr ""
+msgstr "沒有庫存調動，您不能進行提貨。"
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this serial number"
-msgstr ""
+msgstr "該序號的庫存調動"
 
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "貨品銷售計量單位"
 
 #. module: stock
 #: field:stock.location,posz:0
@@ -3561,7 +3568,7 @@ msgstr "走廊 (X)"
 #. module: stock
 #: field:stock.config.settings,group_stock_packaging:0
 msgid "Allow to define several packaging methods on products"
-msgstr ""
+msgstr "允許產品定義多種包裝方式"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -3584,12 +3591,12 @@ msgstr "各分類產品"
 #: selection:stock.picking.in,state:0
 #: selection:stock.picking.out,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "正在等待其它作業"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "供應商倉位"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -3601,7 +3608,7 @@ msgstr "精靈"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "已完成的庫存調動"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3612,7 +3619,7 @@ msgstr "各地點產品"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Logistic"
-msgstr ""
+msgstr "物流"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -3656,7 +3663,7 @@ msgstr "貨架 1"
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr ""
+msgstr "包裹編號"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3670,12 +3677,12 @@ msgstr "來源地點"
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "會計分錄"
 
 #. module: stock
 #: model:res.groups,name:stock.group_stock_manager
 msgid "Manager"
-msgstr ""
+msgstr "主管"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:192
@@ -3689,17 +3696,17 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr ""
+msgstr "內部運送"
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr ""
+msgstr "啟動相關科目"
 
 #. module: stock
 #: field:stock.location.product,type:0
 msgid "Analyse Type"
-msgstr ""
+msgstr "分析類型"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -3731,7 +3738,7 @@ msgstr "一次過"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 msgid "Inventory Move"
-msgstr ""
+msgstr "存貨調動"
 
 #. module: stock
 #: code:addons/stock/product.py:476
@@ -3764,35 +3771,35 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_stock_config_settings
 #: view:stock.config.settings:0
 msgid "Configure Warehouse"
-msgstr ""
+msgstr "倉庫設定"
 
 #. module: stock
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 msgid "To Invoice"
-msgstr ""
+msgstr "待開發票"
 
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Return lines"
-msgstr ""
+msgstr "退貨明細"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr ""
+msgstr "搜尋庫存"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_lines_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
-msgstr ""
+msgstr "盤點日期"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_receive_move
 #: view:product.product:0
 msgid "Receptions"
-msgstr ""
+msgstr "接收"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3802,7 +3809,7 @@ msgstr "總內送量"
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr ""
+msgstr "出貨數量"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -3827,7 +3834,7 @@ msgstr "公司"
 #: field:stock.move.consume,product_uom:0
 #: field:stock.move.scrap,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "產品度量單位"
 
 #. module: stock
 #: view:stock.move:0

addons/stock/wizard/stock_fill_inventory.py

@@ -104,15 +104,16 @@ class stock_fill_inventory(osv.osv_memory):
             datas = {}
             res[location] = {}
             move_ids = move_obj.search(cr, uid, ['|',('location_dest_id','=',location),('location_id','=',location),('state','=','done')], context=context)
-
+            local_context = dict(context)
+            local_context['raise-exception'] = False
             for move in move_obj.browse(cr, uid, move_ids, context=context):
                 lot_id = move.prodlot_id.id
                 prod_id = move.product_id.id
                 if move.location_dest_id.id != move.location_id.id:
                     if move.location_dest_id.id == location:
-                        qty = uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
+                        qty = uom_obj._compute_qty_obj(cr, uid, move.product_uom,move.product_qty, move.product_id.uom_id, context=local_context)
                     else:
-                        qty = -uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
+                        qty = -uom_obj._compute_qty_obj(cr, uid, move.product_uom,move.product_qty, move.product_id.uom_id, context=local_context)
 
 
                     if datas.get((prod_id, lot_id)):

addons/warning/i18n/pt_BR.po

@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Luiz Fernando M.França (Sig Informática) <Unknown>\n"
+"PO-Revision-Date: 2014-03-07 00:20+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@zupy.com.br>\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-11-21 06:38+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-07 07:24+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -120,7 +121,7 @@ msgid ""
 "block the flow. The Message has to be written in the next field."
 msgstr ""
 "Selecionando a opção de \"Aviso\" irá notificar o usuário com a mensagem, "
-"marcar \"Bloqueio de Mensagem\" irá lançar uma exceção com a mensagem e "
+"marcar \"Mensagem de Bloqueio\" irá lançar uma exceção com a mensagem e "
 "bloquear o fluxo. A mensagem tem de ser escrita no campo a seguir."
 
 #. module: warning