diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index c1c6e3f854b..1792525a7f6 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -20,7 +20,6 @@ ############################################################################## import time -import decimal_precision as dp from osv import fields from osv import osv @@ -94,11 +93,12 @@ class account_analytic_line(osv.osv): # Compute based on pricetype pricetype=self.pool.get('product.price.type').browse(cr, uid, company_obj.browse(cr,uid,company_id).property_valuation_price_type.id) # Take the company currency as the reference one - context['currency_id']=company_obj.browse(cr, uid, company_id).currency_id.id - amount_unit=prod.price_get(pricetype.field, context)[prod.id] + amount_unit = prod.price_get(pricetype.field, context)[prod.id] + amount = amount_unit*unit_amount or 1.0 + prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') amount = amount_unit*unit_amount or 1.0 return {'value': { - 'amount': - round(amount, 2), + 'amount': - round(amount, prec), 'general_account_id': a, }} return {} diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 925d3622b5e..deab3deca71 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:49+0000\n" +"PO-Revision-Date: 2010-08-08 06:45+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 7f3f9df3325..a22afed0f8c 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:20+0000\n" +"PO-Revision-Date: 2010-08-08 07:28+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po index ef7b66de928..df710c1c8db 100644 --- a/addons/account/i18n/et.po +++ b/addons/account/i18n/et.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 18:24+0000\n" +"PO-Revision-Date: 2010-08-08 05:46+0000\n" "Last-Translator: lyyser \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -170,6 +170,9 @@ msgid "" "positive, it gives the day of the next month. Set 0 for net days (otherwise " "it's based on the beginning of the month)." msgstr "" +"Kuupäev, pange -1 praeguse kuu viimase päeva näitamiseks. Kui see on " +"positiivne, see annab järmise kuu päeva. Pange 0 netto päevade näitamiseks " +"(muidu see on baseeritud kuu algusel)" #. module: account #: view:account.move:0 diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 2f512f64bf5..846ad93c4e5 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:34+0000\n" +"PO-Revision-Date: 2010-08-08 07:11+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 629155c2530..5a5c1f3bc17 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:51+0000\n" +"PO-Revision-Date: 2010-08-08 06:35+0000\n" "Last-Translator: eLBati - albatos.com \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po index 678e1537ac1..4894d64a9d6 100644 --- a/addons/account/i18n/lt.po +++ b/addons/account/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:38+0000\n" +"PO-Revision-Date: 2010-08-08 06:02+0000\n" "Last-Translator: Giedrius Slavinskas \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 4e2a9a00267..3a63ac88cb5 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:33+0000\n" -"Last-Translator: Munkhbayar Batkhuu \n" +"PO-Revision-Date: 2010-08-07 11:22+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:05+0000\n" +"X-Launchpad-Export-Date: 2010-08-08 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -31,12 +31,12 @@ msgstr "Дансны татварын код" #: model:ir.actions.act_window,name:account.action_invoice_tree9 #: model:ir.ui.menu,name:account.menu_action_invoice_tree9 msgid "Unpaid Supplier Invoices" -msgstr "" +msgstr "Нийлүүлэгчийн төлөгдөөгүй нэхэмжлэлүүд" #. module: account #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Entries Encoding" -msgstr "" +msgstr "Гүйлгээний жагсаалт" #. module: account #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form @@ -61,7 +61,7 @@ msgstr "" #. module: account #: help:account.journal,currency:0 msgid "The currency used to enter statement" -msgstr "" +msgstr "Тухайн журналд гүйлгээ бичихэд хэрэглэгдэнэ" #. module: account #: wizard_view:account_use_models,init_form:0 @@ -74,11 +74,13 @@ msgid "" "This account will be used to value incoming stock for the current product " "category" msgstr "" +"Уг дансанд тухайн ангилалын бараа материалын орлогод авч буй нөөцийн " +"бичилтийг хийнэ" #. module: account #: help:account.invoice,period_id:0 msgid "Keep empty to use the period of the validation(invoice) date." -msgstr "" +msgstr "Хоосон орхивол батлагдсан огноон мөчлөгөөр тодорхойлогдоно." #. module: account #: wizard_view:account.automatic.reconcile,reconcile:0 @@ -88,40 +90,40 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled msgid "Unreconciled entries" -msgstr "" +msgstr "Тулгагдаагүй гүйлгээнүүд" #. module: account #: field:account.invoice.tax,base_code_id:0 #: field:account.tax,base_code_id:0 #: field:account.tax.template,base_code_id:0 msgid "Base Code" -msgstr "" +msgstr "Суурь ангилал" #. module: account #: view:account.account:0 msgid "Account Statistics" -msgstr "" +msgstr "Дансны статистик" #. module: account #: model:ir.actions.wizard,name:account.wizard_vat_declaration #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration msgid "Print Taxes Report" -msgstr "" +msgstr "Татваруудын мэдээлэлийг хэвлэх" #. module: account #: field:account.account,parent_id:0 msgid "Parent" -msgstr "" +msgstr "Эцэг" #. module: account #: selection:account.move,type:0 msgid "Journal Voucher" -msgstr "" +msgstr "Журналын хувьцаа" #. module: account #: field:account.invoice,residual:0 msgid "Residual" -msgstr "" +msgstr "Үлдэгдэл" #. module: account #: field:account.tax,base_sign:0 @@ -129,13 +131,13 @@ msgstr "" #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" -msgstr "" +msgstr "Үндсэн тэмдэг" #. module: account #: model:ir.actions.wizard,name:account.wizard_unreconcile_select #: model:ir.ui.menu,name:account.menu_unreconcile_select msgid "Unreconcile entries" -msgstr "" +msgstr "Гүйлгээг үл тулгах" #. module: account #: constraint:account.period:0 @@ -150,7 +152,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_move_line_form #: model:ir.ui.menu,name:account.menu_action_move_line_form msgid "Entries" -msgstr "" +msgstr "Ажил гүйлгээнүүд" #. module: account #: selection:account.move.line,centralisation:0 @@ -173,12 +175,12 @@ msgstr "" #. module: account #: view:account.move:0 msgid "Total Credit" -msgstr "" +msgstr "Нийт кредит" #. module: account #: field:account.config.wizard,charts:0 msgid "Charts of Account" -msgstr "" +msgstr "Дансны мод" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select @@ -201,19 +203,19 @@ msgstr "" #. module: account #: field:account.tax.code,sum_period:0 msgid "Period Sum" -msgstr "" +msgstr "Мөчлөгийн нийлбэр" #. module: account #: view:account.tax:0 #: view:account.tax.template:0 msgid "Compute Code (if type=code)" -msgstr "" +msgstr "Тооцоолох програмчлалын код (хэрэв төрөл = програмчлал)" #. module: account #: view:account.move:0 #: view:account.move.line:0 msgid "Account Entry Line" -msgstr "" +msgstr "Журналын бичилт" #. module: account #: wizard_view:account.aged.trial.balance,init:0 @@ -223,7 +225,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries msgid "Recurrent Entries" -msgstr "" +msgstr "Давтан гүйлгээнүүд" #. module: account #: field:account.analytic.line,amount:0 @@ -248,12 +250,12 @@ msgstr "" #. module: account #: field:product.template,supplier_taxes_id:0 msgid "Supplier Taxes" -msgstr "" +msgstr "Нийлүүлэгчийн татварууд" #. module: account #: view:account.move:0 msgid "Total Debit" -msgstr "" +msgstr "Нийт дебит" #. module: account #: rml:account.tax.code.entries:0 @@ -268,6 +270,10 @@ msgid "" "in which order. You can create your own view for a faster encoding in each " "journal." msgstr "" +"Тухайн журналийн гүйлгээний жагсаалтын харагдах байдал. Энэ нь аль талбар нь " +"харагдах, заавал бөглөх, зөвхөн унших зэргийг тодорхойлно. Та журнал бүр " +"дээр өөрийн хүссэн хэлбэрээр харагдах байдлыг хялбархнаар тодорхойлох " +"боломжтой." #. module: account #: help:account.invoice,date_due:0 @@ -289,7 +295,7 @@ msgstr "" #: model:ir.actions.report.xml,name:account.account_overdue #: view:res.company:0 msgid "Overdue Payments" -msgstr "" +msgstr "Төлбөр шаардах хуудас" #. module: account #: wizard_view:account.account.balance.report,checktype:0 @@ -300,7 +306,7 @@ msgstr "" #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 #: wizard_view:account.vat.declaration,init:0 msgid "Select period" -msgstr "" +msgstr "Мөчлөг сонгох" #. module: account #: field:account.invoice,origin:0 @@ -311,7 +317,7 @@ msgstr "" #. module: account #: rml:account.analytic.account.journal:0 msgid "Move Name" -msgstr "" +msgstr "Гүйлгээний нэр" #. module: account #: xsl:account.transfer:0 @@ -326,12 +332,12 @@ msgstr "" #. module: account #: rml:account.central.journal:0 msgid "Account Num." -msgstr "" +msgstr "Дансны №." #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Delta Debit" -msgstr "" +msgstr "Дебит зөрүү" #. module: account #: rml:account.invoice:0 @@ -351,20 +357,20 @@ msgstr "" #: field:account.move.line,analytic_account_id:0 #: field:report.hr.timesheet.invoice.journal,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Аналитик данс" #. module: account #: field:account.tax,child_depend:0 #: field:account.tax.template,child_depend:0 msgid "Tax on Children" -msgstr "" +msgstr "Дэд татвар дээр тооцоолох" #. module: account #: rml:account.central.journal:0 #: rml:account.general.journal:0 #: field:account.journal,name:0 msgid "Journal Name" -msgstr "" +msgstr "Журналын нэр" #. module: account #: view:account.payment.term:0 @@ -374,7 +380,7 @@ msgstr "" #. module: account #: constraint:account.analytic.account:0 msgid "Error! You can not create recursive analytic accounts." -msgstr "" +msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй." #. module: account #: field:account.bank.statement.reconcile,total_entry:0 @@ -385,12 +391,12 @@ msgstr "" #: field:account.fiscal.position.account,account_src_id:0 #: field:account.fiscal.position.account.template,account_src_id:0 msgid "Account Source" -msgstr "" +msgstr "Эх данс" #. module: account #: field:account.journal,update_posted:0 msgid "Allow Cancelling Entries" -msgstr "" +msgstr "Бичилт цуцлахыг зөвшөөрөх" #. module: account #: model:process.transition,name:account.process_transition_paymentorderbank0 @@ -406,7 +412,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal msgid "All Analytic Entries" -msgstr "" +msgstr "Бүх аналитик бичилтүүд" #. module: account #: rml:account.overdue:0 @@ -421,7 +427,7 @@ msgstr "" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "" +msgstr "(Данс/Харилцагч) Нэр" #. module: account #: selection:account.move,type:0 @@ -442,13 +448,13 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_invoice_tree13 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13 msgid "Unpaid Supplier Refunds" -msgstr "" +msgstr "Нийлүүлэгчийн төлөгдөөгүй буцаалт" #. module: account #: view:account.tax:0 #: view:account.tax.template:0 msgid "Special Computation" -msgstr "" +msgstr "Тусгай тооцоололт" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 @@ -460,7 +466,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree msgid "Bank reconciliation" -msgstr "" +msgstr "Банкны гүйлгээ тулгалт" #. module: account #: rml:account.invoice:0 @@ -474,12 +480,12 @@ msgstr "" #: rml:account.overdue:0 #: field:account.subscription,ref:0 msgid "Ref" -msgstr "" +msgstr "Дугаар" #. module: account #: field:account.tax.template,type_tax_use:0 msgid "Tax Use In" -msgstr "" +msgstr "Татварын хэрэглээ" #. module: account #: help:account.tax.template,include_base_amount:0 @@ -487,11 +493,13 @@ msgid "" "Set if the amount of tax must be included in the base amount before " "computing the next taxes." msgstr "" +"Тухайн татварын дүн үндсэн дүнд шингэж дараагийн татвар тооцоололтод оролцох " +"эсэх." #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing msgid "Periodical Processing" -msgstr "" +msgstr "Тогтмол хугацааны боловсруулалт" #. module: account #: view:report.hr.timesheet.invoice.journal:0 @@ -502,7 +510,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "" +msgstr "Татварын ангилалын загвар" #. module: account #: view:account.invoice:0 @@ -524,28 +532,28 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form msgid "Tax Templates" -msgstr "" +msgstr "Татварын загвар" #. module: account #: field:account.invoice,reconciled:0 msgid "Paid/Reconciled" -msgstr "" +msgstr "Төлсөн/Тулгасан" #. module: account #: field:account.account.type,close_method:0 msgid "Deferral Method" -msgstr "" +msgstr "Хаагдах хэлбэр" #. module: account #: field:account.tax.template,include_base_amount:0 msgid "Include in Base Amount" -msgstr "" +msgstr "Суурь дүнд шингэх" #. module: account #: field:account.tax,ref_base_code_id:0 #: field:account.tax.template,ref_base_code_id:0 msgid "Refund Base Code" -msgstr "" +msgstr "Буцаалтын суурь ангилал" #. module: account #: view:account.invoice.line:0 @@ -573,12 +581,12 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax msgid "account.tax" -msgstr "" +msgstr "Татвар" #. module: account #: rml:account.central.journal:0 msgid "Printing Date" -msgstr "" +msgstr "Хэвлэсэн огноо" #. module: account #: rml:account.general.ledger:0 @@ -594,7 +602,7 @@ msgstr "" #. module: account #: view:account.journal:0 msgid "Entry Controls" -msgstr "" +msgstr "Гүйлгээний удирдлага" #. module: account #: help:account.model.line,sequence:0 @@ -623,7 +631,7 @@ msgstr "" #: selection:account.model.line,date:0 #: selection:account.model.line,date_maturity:0 msgid "Partner Payment Term" -msgstr "" +msgstr "Харилцагчийн төлбөрийн нөхцөл" #. module: account #: view:account.move.reconcile:0 @@ -654,7 +662,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_analytic_accounting msgid "Analytic Accounting" -msgstr "" +msgstr "Аналитик санхүү бүртгэл" #. module: account #: rml:account.overdue:0 @@ -667,7 +675,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_analytic_line_form #: model:ir.ui.menu,name:account.next_id_41 msgid "Analytic Entries" -msgstr "" +msgstr "Аналитик бичилтүүд" #. module: account #: selection:account.subscription,period_type:0 @@ -677,7 +685,7 @@ msgstr "" #. module: account #: field:account.analytic.account,partner_id:0 msgid "Associated Partner" -msgstr "" +msgstr "Холбогдох харилцагч" #. module: account #: field:account.invoice,comment:0 @@ -687,7 +695,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 msgid "Customer Refund" -msgstr "" +msgstr "Худалдан авагчийн буцаалт" #. module: account #: wizard_view:account.analytic.account.chart,init:0 @@ -700,12 +708,12 @@ msgstr "" #: field:account.tax.template,ref_tax_sign:0 #: field:account.tax.template,tax_sign:0 msgid "Tax Code Sign" -msgstr "" +msgstr "Татварын ангилалын тэмдэг" #. module: account #: help:res.partner,credit:0 msgid "Total amount this customer owes you." -msgstr "" +msgstr "Энэ худалдан авагчаас авах нийт авлагын дүн." #. module: account #: view:account.move.line:0 @@ -720,29 +728,29 @@ msgstr "" #. module: account #: model:process.transition,name:account.process_transition_supplieranalyticcost0 msgid "Analytic Invoice" -msgstr "" +msgstr "Аналитик нэхэмжлэл" #. module: account #: field:account.journal.column,field:0 msgid "Field Name" -msgstr "" +msgstr "Талбарын нэр" #. module: account #: field:account.tax.code,sign:0 #: field:account.tax.code.template,sign:0 msgid "Sign for parent" -msgstr "" +msgstr "Эцэгт зориулсан тэмдэг" #. module: account #: field:account.fiscalyear,end_journal_period_id:0 msgid "End of Year Entries Journal" -msgstr "" +msgstr "Жилийн төгсгөлийн бичилтийн журнал" #. module: account #: view:product.product:0 #: view:product.template:0 msgid "Purchase Properties" -msgstr "" +msgstr "Худалдан авалтын талбарууд" #. module: account #: model:process.node,note:account.process_node_paymententries0 @@ -778,7 +786,7 @@ msgstr "" #. module: account #: field:account.account.type,partner_account:0 msgid "Partner account" -msgstr "" +msgstr "Харилцагчийн данс" #. module: account #: wizard_view:account.subscription.generate,init:0 @@ -791,7 +799,7 @@ msgstr "" #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report msgid "Cost Ledger" -msgstr "" +msgstr "Өртөгийн тайлан" #. module: account #: wizard_view:account.account.balance.report,checktype:0 @@ -799,7 +807,7 @@ msgstr "" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "(Keep empty for all open fiscal years)" -msgstr "" +msgstr "(Хоосон орхивол бүх нээлттэй санхүүгийн жилүүд)" #. module: account #: field:account.invoice,move_lines:0 @@ -810,7 +818,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" -msgstr "" +msgstr "Дансны өртөг болон орлого журналаар" #. module: account #: help:account.account.template,user_type:0 @@ -818,6 +826,8 @@ msgid "" "These types are defined according to your country. The type contain more " "information about the account and it's specificities." msgstr "" +"Энэ нь танай улсад мөрддөг дансны төрлүүд юм. Төрөл нь дансны тухай тодорхой " +"мэдээллийг агуулсан байна." #. module: account #: selection:account.automatic.reconcile,init,power:0 @@ -827,26 +837,26 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.next_id_30 msgid "Bank Reconciliation" -msgstr "" +msgstr "Банкны гүйлгээ тулгалт" #. module: account #: model:ir.model,name:account.model_account_account_template msgid "Templates for Accounts" -msgstr "" +msgstr "Дансны загвар" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_form #: model:ir.model,name:account.model_account_analytic_account #: model:ir.ui.menu,name:account.account_analytic_def_account msgid "Analytic Accounts" -msgstr "" +msgstr "Аналитик дансууд" #. module: account #: wizard_view:account.print.journal.report,init:0 #: model:ir.actions.wizard,name:account.wizard_print_journal #: model:ir.ui.menu,name:account.menu_print_journal msgid "Print Journal" -msgstr "" +msgstr "Журнал хэвлэх" #. module: account #: model:ir.model,name:account.model_account_bank_accounts_wizard @@ -857,12 +867,12 @@ msgstr "" #: field:account.move.line,date_created:0 #: field:account.move.reconcile,create_date:0 msgid "Creation date" -msgstr "" +msgstr "Үүссэн огноо" #. module: account #: wizard_button:account.invoice.refund,init,cancel_invoice:0 msgid "Cancel Invoice" -msgstr "" +msgstr "Нэхэмжлэл цуцлах" #. module: account #: field:account.journal.column,required:0 @@ -873,7 +883,7 @@ msgstr "" #: field:product.category,property_account_expense_categ:0 #: field:product.template,property_account_expense:0 msgid "Expense Account" -msgstr "" +msgstr "Зарлагын данс" #. module: account #: wizard_field:account.move.line.reconcile,addendum,journal_id:0 @@ -884,17 +894,17 @@ msgstr "" #: field:account.model.line,amount_currency:0 #: field:account.move.line,amount_currency:0 msgid "Amount Currency" -msgstr "" +msgstr "Валютын дүн" #. module: account #: field:account.chart.template,property_account_expense_categ:0 msgid "Expense Category Account" -msgstr "" +msgstr "Зардлын толгой данс" #. module: account #: wizard_field:account.fiscalyear.close,init,fy2_id:0 msgid "New Fiscal Year" -msgstr "" +msgstr "Шинэ санхүүгийн жил" #. module: account #: help:account.tax,tax_group:0 @@ -906,12 +916,12 @@ msgstr "" #. module: account #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0 msgid "Fiscal Year to Open" -msgstr "" +msgstr "Нээх санхүүгийн жил" #. module: account #: view:account.config.wizard:0 msgid "Select Chart of Accounts" -msgstr "" +msgstr "Дансны мод сонгох" #. module: account #: field:account.analytic.account,quantity:0 @@ -937,17 +947,17 @@ msgstr "" #. module: account #: field:account.invoice.tax,base_amount:0 msgid "Base Code Amount" -msgstr "" +msgstr "Суурь ангилалын дүн" #. module: account #: help:account.journal,user_id:0 msgid "The user responsible for this journal" -msgstr "" +msgstr "Уг журналыг эзэмшин хариуцах хэрэглэгч" #. module: account #: field:account.journal,default_debit_account_id:0 msgid "Default Debit Account" -msgstr "" +msgstr "Тогтсон дебит данс" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_tree @@ -958,7 +968,7 @@ msgstr "" #. module: account #: model:process.transition,name:account.process_transition_analyticinvoice0 msgid "analytic Invoice" -msgstr "" +msgstr "Аналитик нэхэмжлэл" #. module: account #: wizard_field:account.automatic.reconcile,init,period_id:0 @@ -977,7 +987,7 @@ msgstr "" #: wizard_field:account.print.journal.report,init,period_id:0 #: field:account.subscription,period_nbr:0 msgid "Period" -msgstr "" +msgstr "Мөчлөг" #. module: account #: rml:account.partner.balance:0 @@ -987,7 +997,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_accounting msgid "Financial Accounting" -msgstr "" +msgstr "Санхүү бүртгэл" #. module: account #: rml:account.invoice:0 @@ -1006,52 +1016,52 @@ msgstr "" #: model:ir.model,name:account.model_account_fiscal_position #: field:res.partner,property_account_position:0 msgid "Fiscal Position" -msgstr "" +msgstr "Фискал посишион" #. module: account #: field:account.analytic.line,product_uom_id:0 #: field:account.move.line,product_uom_id:0 msgid "UoM" -msgstr "" +msgstr "Хэмжих нэгж" #. module: account #: wizard_field:account.third_party_ledger.report,init,page_split:0 msgid "One Partner Per Page" -msgstr "" +msgstr "Хуудас бүрт нэг харилцагч" #. module: account #: field:account.account,child_parent_ids:0 #: field:account.account.template,child_parent_ids:0 msgid "Children" -msgstr "" +msgstr "Дэд данс" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax msgid "Fiscal Position Taxes Mapping" -msgstr "" +msgstr "Санхүүгийн байршил татварын зурагжуулалт" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree2_new #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new msgid "New Supplier Invoice" -msgstr "" +msgstr "Шинэ нийлүүлэгчийн нэхэмжлэл" #. module: account #: wizard_field:account.invoice.pay,init,amount:0 msgid "Amount paid" -msgstr "" +msgstr "Төлсөн дүн" #. module: account #: selection:account.invoice,type:0 #: model:process.transition,name:account.process_transition_customerinvoice0 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0 msgid "Customer Invoice" -msgstr "" +msgstr "Худалдан авагчийн нэхэмжлэл" #. module: account #: wizard_view:account.open_closed_fiscalyear,init:0 msgid "Choose Fiscal Year" -msgstr "" +msgstr "Санхүүгийн жил сонгох" #. module: account #: field:account.sequence.fiscalyear,sequence_main_id:0 @@ -1062,7 +1072,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree #: model:ir.ui.menu,name:account.account_analytic_journal_print msgid "Print Analytic Journals" -msgstr "" +msgstr "Аналитик журнал хэвлэх" #. module: account #: rml:account.tax.code.entries:0 @@ -1084,38 +1094,38 @@ msgstr "" #. module: account #: view:account.tax.template:0 msgid "Compute Code for Taxes included prices" -msgstr "" +msgstr "Үндсэн үнэд шингэсэн татварыг тооцоолох програмчлалын код" #. module: account #: view:account.invoice.tax:0 #: model:ir.actions.act_window,name:account.action_tax_code_list #: model:ir.ui.menu,name:account.menu_action_tax_code_list msgid "Tax codes" -msgstr "" +msgstr "Татварын ангилалууд" #. module: account #: field:account.fiscal.position.template,chart_template_id:0 #: field:account.tax.template,chart_template_id:0 #: field:wizard.multi.charts.accounts,chart_template_id:0 msgid "Chart Template" -msgstr "" +msgstr "Загвар дансны мод" #. module: account #: field:account.chart.template,property_account_income_categ:0 msgid "Income Category Account" -msgstr "" +msgstr "Орлогын толгой данс" #. module: account #: model:ir.actions.act_window,name:account.analytic_account_form #: model:ir.ui.menu,name:account.account_analytic_form msgid "New Analytic Account" -msgstr "" +msgstr "Шинэ аналитик данс" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template msgid "Fiscal Position Templates" -msgstr "" +msgstr "Загвар фискал посишион" #. module: account #: rml:account.invoice:0 @@ -1141,13 +1151,13 @@ msgstr "" #. module: account #: help:account.model.line,amount_currency:0 msgid "The amount expressed in an optional other currency." -msgstr "" +msgstr "Гүйлгээний валютаар илэрхийлэгдэх дүн" #. module: account #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Position Template" -msgstr "" +msgstr "Загвар фискал посишион" #. module: account #: field:account.payment.term,line_ids:0 @@ -1157,7 +1167,7 @@ msgstr "" #. module: account #: rml:account.vat.declaration:0 msgid "Tax Report" -msgstr "" +msgstr "Татварын мэдээлэл" #. module: account #: wizard_button:account.analytic.account.chart,init,open:0 @@ -1168,7 +1178,7 @@ msgstr "" #. module: account #: wizard_view:account.fiscalyear.close.state,init:0 msgid "Are you sure you want to close the fiscal year ?" -msgstr "" +msgstr "Та уг санхүүгийн жилийг хаахдаа итгэлтэй байна уу?" #. module: account #: selection:account.move,type:0 @@ -1178,12 +1188,12 @@ msgstr "" #. module: account #: view:res.partner:0 msgid "Bank account" -msgstr "" +msgstr "Банкны данс" #. module: account #: field:account.chart.template,tax_template_ids:0 msgid "Tax Template List" -msgstr "" +msgstr "Татварын загварын жагсаалт" #. module: account #: model:process.transition,name:account.process_transition_invoiceimport0 @@ -1193,7 +1203,7 @@ msgstr "" #. module: account #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select msgid "Standard entry" -msgstr "" +msgstr "Стандарт гүйлгээ" #. module: account #: help:account.account,currency_mode:0 @@ -1208,7 +1218,7 @@ msgstr "" #. module: account #: field:account.account,company_currency_id:0 msgid "Company Currency" -msgstr "" +msgstr "Компаны валют" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account_template @@ -1218,7 +1228,7 @@ msgstr "" #. module: account #: field:account.analytic.account,parent_id:0 msgid "Parent Analytic Account" -msgstr "" +msgstr "Эцэг аналитик данс" #. module: account #: wizard_button:account.move.line.reconcile,init_partial,addendum:0 @@ -1228,43 +1238,43 @@ msgstr "" #. module: account #: field:account.move.line,tax_amount:0 msgid "Tax/Base Amount" -msgstr "" +msgstr "Татвар/Үндсэн дүн" #. module: account #: help:wizard.multi.charts.accounts,code_digits:0 msgid "No. of Digits to use for account code" -msgstr "" +msgstr "Дансны дугаарт хэрэглэх тэмдэгтийн хэмжээ (оронгийн хэмжээ)" #. module: account #: field:account.bank.statement,balance_end_real:0 msgid "Ending Balance" -msgstr "" +msgstr "Төгсгөлийн баланс" #. module: account #: view:product.product:0 msgid "Purchase Taxes" -msgstr "" +msgstr "Худалдан авалтын татварууд" #. module: account #: field:account.payment.term.line,name:0 msgid "Line Name" -msgstr "" +msgstr "Мөрийн нэр" #. module: account #: selection:account.payment.term.line,value:0 msgid "Fixed Amount" -msgstr "" +msgstr "Тогтмол дүн" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Analytic Credit" -msgstr "" +msgstr "Аналитик кредит" #. module: account #: field:account.move.line,reconcile_partial_id:0 #: wizard_button:account.move.line.reconcile,init_partial,partial:0 msgid "Partial Reconcile" -msgstr "" +msgstr "Хэсэгчилсэн тулгалт" #. module: account #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0 @@ -1276,7 +1286,7 @@ msgstr "" #: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" -msgstr "" +msgstr "Татварын харгалзаа" #. module: account #: view:account.config.wizard:0 @@ -1304,7 +1314,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "" +msgstr "Санхүүгийн жил хаах" #. module: account #: field:account.journal,centralisation:0 @@ -1342,18 +1352,18 @@ msgstr "" #: field:account.move.line,analytic_lines:0 #: model:ir.model,name:account.model_account_analytic_line msgid "Analytic lines" -msgstr "" +msgstr "Аналитик мөрүүд" #. module: account #: help:account.tax,type:0 msgid "The computation method for the tax amount." -msgstr "" +msgstr "Татварын дүнг тооцоолох арга хэлбэр." #. module: account #: model:process.node,note:account.process_node_accountingentries0 #: model:process.node,note:account.process_node_supplieraccountingentries0 msgid "Validated accounting entries." -msgstr "" +msgstr "Батлагдсан гүйлгээнүүд." #. module: account #: wizard_view:account.move.line.unreconcile,init:0 @@ -1366,28 +1376,28 @@ msgstr "" #. module: account #: model:process.node,name:account.process_node_electronicfile0 msgid "Electronic File" -msgstr "" +msgstr "Электроник файл" #. module: account #: view:res.partner:0 msgid "Customer Credit" -msgstr "" +msgstr "Худалдан авагчийн кредит" #. module: account #: field:account.invoice,tax_line:0 msgid "Tax Lines" -msgstr "" +msgstr "Татварууд" #. module: account #: field:ir.sequence,fiscal_ids:0 msgid "Sequences" -msgstr "" +msgstr "Дараалал" #. module: account #: model:ir.actions.act_window,name:account.action_account_type_form #: model:ir.ui.menu,name:account.menu_action_account_type_form msgid "Account Types" -msgstr "" +msgstr "Дансны төрөл" #. module: account #: wizard_field:account.automatic.reconcile,init,journal_id:0 @@ -1415,23 +1425,23 @@ msgstr "" #: field:account.account,child_id:0 #: field:account.analytic.account,child_ids:0 msgid "Child Accounts" -msgstr "" +msgstr "Дэд дансууд" #. module: account #: field:account.account,check_history:0 msgid "Display History" -msgstr "" +msgstr "Дэлгэрэнгүй хэвлэх" #. module: account #: wizard_field:account.third_party_ledger.report,init,date1:0 msgid " Start date" -msgstr "" +msgstr " Эхлэх огноо" #. module: account #: wizard_field:account.account.balance.report,checktype,display_account:0 #: wizard_field:account.general.ledger.report,checktype,display_account:0 msgid "Display accounts " -msgstr "" +msgstr "Данс харуулах " #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile_line @@ -1443,6 +1453,7 @@ msgstr "" #: view:account.tax.template:0 msgid "Keep empty to use the income account" msgstr "" +"Татварын дүнг орлогын дансанд бичих бол татварын дансыг хоосон орхино" #. module: account #: view:account.bank.statement.reconcile:0 @@ -1462,12 +1473,12 @@ msgstr "" #. module: account #: field:res.partner,debit:0 msgid "Total Payable" -msgstr "" +msgstr "Нийт өглөг" #. module: account #: wizard_button:account.fiscalyear.close.state,init,close:0 msgid "Close states" -msgstr "" +msgstr "Төлөв хаах" #. module: account #: model:ir.model,name:account.model_wizard_company_setup @@ -1482,17 +1493,17 @@ msgstr "" #. module: account #: field:account.journal,refund_journal:0 msgid "Refund Journal" -msgstr "" +msgstr "Буцаалтын журнал" #. module: account #: model:account.account.type,name:account.account_type_income msgid "Income" -msgstr "" +msgstr "Орлого" #. module: account #: selection:account.bank.statement.line,type:0 msgid "Supplier" -msgstr "" +msgstr "Нийлүүлэгч" #. module: account #: rml:account.invoice:0 @@ -1502,7 +1513,7 @@ msgstr "" #. module: account #: field:account.invoice.tax,tax_amount:0 msgid "Tax Code Amount" -msgstr "" +msgstr "Татварын кодны хэмжээ" #. module: account #: selection:account.account.type,sign:0 @@ -1514,41 +1525,41 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_general_journal #: model:ir.ui.menu,name:account.menu_general_journal msgid "Print General Journal" -msgstr "" +msgstr "Ерөнхий журнал хэвлэх" #. module: account #: model:ir.actions.act_window,name:account.action_account_chart_template_form #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form msgid "Chart of Accounts Templates" -msgstr "" +msgstr "Дансны модны загвар" #. module: account #: field:account.invoice,move_id:0 msgid "Invoice Movement" -msgstr "" +msgstr "Гүйлгээний нэхэмжлэл" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart #: model:ir.ui.menu,name:account.menu_wizard #: view:wizard.multi.charts.accounts:0 msgid "Generate Chart of Accounts from a Chart Template" -msgstr "" +msgstr "Загвар ашиглан дансны төлөвлөгөө үүсгэх" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Statements" -msgstr "" +msgstr "Албан ёсны мэдээ тайлан" #. module: account #: field:account.tax.code,parent_id:0 #: field:account.tax.code.template,parent_id:0 msgid "Parent Code" -msgstr "" +msgstr "Эцэг ангилал" #. module: account #: wizard_button:account.move.line.reconcile.select,init,open:0 msgid "Open for reconciliation" -msgstr "" +msgstr "Тулгагдсан бичилтүүдийг нээх" #. module: account #: model:account.journal,name:account.bilan_journal @@ -1564,18 +1575,19 @@ msgstr "" #. module: account #: rml:account.analytic.account.journal:0 msgid "Account n°" -msgstr "" +msgstr "Данс n°" #. module: account #: view:account.tax:0 #: view:account.tax.template:0 msgid "Keep empty to use the expense account" msgstr "" +"Татварын дүнг зарлагын дансанд бичих бол татварын дансыг хоосон орхино" #. module: account #: wizard_field:account.automatic.reconcile,init,account_ids:0 msgid "Account to reconcile" -msgstr "" +msgstr "Тулгалт хийх данс" #. module: account #: rml:account.invoice:0 @@ -1588,7 +1600,7 @@ msgstr "" #: selection:account.partner.balance.report,init,result_selection:0 #: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Receivable and Payable Accounts" -msgstr "" +msgstr "Авлага, өглөгийн дансууд" #. module: account #: view:account.subscription:0 @@ -1602,23 +1614,23 @@ msgstr "" #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Purchase" -msgstr "" +msgstr "Худалдан авалт" #. module: account #: view:account.analytic.line:0 msgid "Total quantity" -msgstr "" +msgstr "Нийт тоо хэмжээ" #. module: account #: field:account.invoice,date_due:0 msgid "Due Date" -msgstr "" +msgstr "Дахин давтах огноо" #. module: account #: wizard_view:account.period.close,init:0 #: wizard_button:account.period.close,init,close:0 msgid "Close Period" -msgstr "" +msgstr "Мөчлөг хаах" #. module: account #: rml:account.overdue:0 @@ -1633,12 +1645,12 @@ msgstr "" #. module: account #: view:account.journal:0 msgid "Accounts Type Allowed (empty for no control)" -msgstr "" +msgstr "Зөвшөөрөгдсөн дансны төрөл (хоосон орхивол бүгдийг зөвшөөрнө )" #. module: account #: field:account.bank.statement,balance_start:0 msgid "Starting Balance" -msgstr "" +msgstr "Эхлэлийн баланс" #. module: account #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0 @@ -1646,7 +1658,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_journal_period_tree #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree msgid "Journals" -msgstr "" +msgstr "Журналууд" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 @@ -1656,29 +1668,29 @@ msgstr "" #. module: account #: wizard_button:account.invoice.refund,init,refund:0 msgid "Refund Invoice" -msgstr "" +msgstr "Буцаалтын нэхэмжлэл" #. module: account #: model:ir.actions.act_window,name:account.action_account_period_tree #: model:ir.actions.wizard,name:account.wizard_period_close #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree msgid "Close a Period" -msgstr "" +msgstr "Мөчлөг хаах" #. module: account #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal msgid "Costs & Revenues" -msgstr "" +msgstr "Өртөг ба Орлого" #. module: account #: constraint:account.account:0 msgid "Error ! You can not create recursive accounts." -msgstr "" +msgstr "Алдаа! Та цикл хэлбэрийн данс үүсгэх боломжгүй." #. module: account #: rml:account.tax.code.entries:0 msgid "Account Number" -msgstr "" +msgstr "Дансны дугаар" #. module: account #: view:account.config.wizard:0 @@ -1688,38 +1700,38 @@ msgstr "" #. module: account #: field:account.invoice,period_id:0 msgid "Force Period" -msgstr "" +msgstr "Мөчлөг" #. module: account #: help:account.account.type,sequence:0 msgid "Gives the sequence order when displaying a list of account types." -msgstr "" +msgstr "Дансны төрлийн жагсаалтад хэрхэн эрэмбэлэгдэх дараалал." #. module: account #: view:account.invoice:0 msgid "Re-Open" -msgstr "" +msgstr "Дахин нээх" #. module: account #: wizard_view:account.fiscalyear.close,init:0 msgid "Are you sure you want to create entries?" -msgstr "" +msgstr "Та гүйлгээ үүсгэхдээ итгэлтэй байна уу?" #. module: account #: field:account.tax,include_base_amount:0 msgid "Include in base amount" -msgstr "" +msgstr "Суурь дүнд шингэх" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Delta Credit" -msgstr "" +msgstr "Кредит зөрүү" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile #: model:ir.actions.wizard,name:account.wizard_unreconcile msgid "Unreconcile Entries" -msgstr "" +msgstr "Гүйлгээг үл тулгах" #. module: account #: model:process.node,note:account.process_node_supplierdraftinvoices0 @@ -1735,7 +1747,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_bank_statement_tree2 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2 msgid "New Statement" -msgstr "" +msgstr "Шинэ хуулга" #. module: account #: wizard_field:account.analytic.account.chart,init,from_date:0 @@ -1754,24 +1766,24 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_central_journal #: model:ir.ui.menu,name:account.menu_central_journal msgid "Print Central Journal" -msgstr "" +msgstr "Төв журнал хэвлэх" #. module: account #: wizard_field:account.aged.trial.balance,init,period_length:0 msgid "Period length (days)" -msgstr "" +msgstr "Мөчлөгийн үргэлжилэх хугацаа (өдөр)" #. module: account #: selection:account.payment.term.line,value:0 #: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "Percent" -msgstr "" +msgstr "Хувь" #. module: account #: model:ir.ui.menu,name:account.menu_finance_charts msgid "Charts" -msgstr "" +msgstr "Моднууд" #. module: account #: selection:account.analytic.journal,type:0 @@ -1779,13 +1791,13 @@ msgstr "" #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Sale" -msgstr "" +msgstr "Борлуулалт" #. module: account #: wizard_button:account.account.balance.report,account_selection,checktype:0 #: wizard_button:account.general.ledger.report,account_selection,checktype:0 msgid "Next" -msgstr "" +msgstr "Цааш нь" #. module: account #: help:res.partner,property_account_position:0 @@ -1793,16 +1805,17 @@ msgid "" "The fiscal position will determine taxes and the accounts used for the the " "partner." msgstr "" +"Зөвхөн тухайн харилцагчид зориулагдсан татвар, дансуудыг тодорхойлно." #. module: account #: rml:account.analytic.account.cost_ledger:0 msgid "Date or Code" -msgstr "" +msgstr "Огноо эсвэл код" #. module: account #: field:account.analytic.account,user_id:0 msgid "Account Manager" -msgstr "" +msgstr "Дансны менежер" #. module: account #: rml:account.analytic.account.journal:0 @@ -1813,12 +1826,12 @@ msgstr "" #: wizard_field:account.move.line.reconcile,init_full,debit:0 #: wizard_field:account.move.line.reconcile,init_partial,debit:0 msgid "Debit amount" -msgstr "" +msgstr "Дебит дүн" #. module: account #: selection:account.subscription,period_type:0 msgid "year" -msgstr "" +msgstr "Жил" #. module: account #: wizard_button:account.account.balance.report,checktype,report:0 @@ -1835,7 +1848,7 @@ msgstr "" #: wizard_button:account.print.journal.report,init,print:0 #: wizard_button:account.third_party_ledger.report,init,checkreport:0 msgid "Print" -msgstr "" +msgstr "Хэвлэх" #. module: account #: wizard_field:account.account.balance.report,checktype,date_from:0 @@ -1861,29 +1874,29 @@ msgstr "" #. module: account #: view:account.journal:0 msgid "Accounts Allowed (empty for no control)" -msgstr "" +msgstr "Зөвшөөрөгдсөн дансууд (хоосон орхивол бүгдийг зөвшөөрнө)" #. module: account #: view:account.invoice:0 msgid "Untaxed amount" -msgstr "" +msgstr "Татвар ноогдохгүй хэмжээ" #. module: account #: field:account.tax,account_collected_id:0 #: field:account.tax.template,account_collected_id:0 msgid "Invoice Tax Account" -msgstr "" +msgstr "Нэхэмжлэлийн татварын данс" #. module: account #: view:account.move.line:0 msgid "Analytic Lines" -msgstr "" +msgstr "Аналитик мөрүүд" #. module: account #: wizard_view:account.invoice.pay,init:0 #: model:ir.actions.wizard,name:account.wizard_invoice_pay msgid "Pay invoice" -msgstr "" +msgstr "Цалингийн нэхэмжлэл" #. module: account #: constraint:account.invoice:0 @@ -1894,7 +1907,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_invoice_tree5 #: model:ir.ui.menu,name:account.menu_invoice_draft msgid "Draft Customer Invoices" -msgstr "" +msgstr "Худалдан авагчийн ноорог нэхэмжлэл" #. module: account #: model:ir.model,name:account.model_account_subscription_line @@ -1907,32 +1920,32 @@ msgstr "" #: selection:account.partner.balance.report,init,state:0 #: selection:account.third_party_ledger.report,init,state:0 msgid "No Filter" -msgstr "" +msgstr "Шүүлтгүй" #. module: account #: field:account.payment.term.line,days:0 msgid "Number of Days" -msgstr "" +msgstr "Өдрийн дугаар" #. module: account #: help:account.invoice,reference:0 msgid "The partner reference of this invoice." -msgstr "" +msgstr "Уг нэхэмжлэлийг тухайн харилцагч хэрхэн нэрлэн дугаарлах." #. module: account #: wizard_field:account.general.ledger.report,checktype,sortbydate:0 msgid "Sort by:" -msgstr "" +msgstr "Эрэмбэлэх" #. module: account #: field:account.move,to_check:0 msgid "To Be Verified" -msgstr "" +msgstr "Шалгагдана" #. module: account #: help:res.partner,debit:0 msgid "Total amount you have to pay to this supplier." -msgstr "" +msgstr "Энэ нийлүүлэгчид өгөх нийт өглөгийн дүн." #. module: account #: selection:account.automatic.reconcile,init,power:0 @@ -1942,7 +1955,7 @@ msgstr "" #. module: account #: model:ir.actions.report.xml,name:account.account_transfers msgid "Transfers" -msgstr "" +msgstr "Шилжүүлэлт" #. module: account #: rml:account.overdue:0 @@ -1952,44 +1965,44 @@ msgstr "" #. module: account #: wizard_view:account.chart,init:0 msgid "Account charts" -msgstr "" +msgstr "Дансны мод" #. module: account #: help:account.tax,name:0 msgid "This name will be displayed on reports" -msgstr "" +msgstr "Энэ нэр тайлан дээр тусгагдана" #. module: account #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Printing date" -msgstr "" +msgstr "Хэвлэсэн огноо" #. module: account #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Харагдах архитектурт нийцэхгүй XML!" #. module: account #: wizard_field:account.partner.balance.report,init,date1:0 msgid " Start date" -msgstr "" +msgstr " Эхлэх огноо" #. module: account #: wizard_view:account.analytic.account.journal.report,init:0 msgid "Analytic Journal Report" -msgstr "" +msgstr "Аналитик журналын тайлан" #. module: account #: 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 #: rml:account.vat.declaration:0 msgid "Tax Amount" -msgstr "" +msgstr "Татварын хэмжээ" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 @@ -1999,13 +2012,13 @@ msgstr "" #. module: account #: field:account.journal.period,name:0 msgid "Journal-Period Name" -msgstr "" +msgstr "Журналын мөчлөгийн нэр" #. module: account #: field:account.tax.code,name:0 #: field:account.tax.code.template,name:0 msgid "Tax Case Name" -msgstr "" +msgstr "Ангилалын нэр" #. module: account #: help:account.journal,entry_posted:0 @@ -2014,6 +2027,8 @@ msgid "" "'draft' state and instead goes directly to the 'posted state' without any " "manual validation." msgstr "" +"Уг журналд гүйлгээ бичих үед 'ноорог' төлвийг алгасан шууд 'батлагдсан' " +"төлөвт шилжинэ. Нягтлан гараар батлах шаардлагагүй." #. module: account #: field:account.bank.statement.line,partner_id:0 @@ -2025,7 +2040,7 @@ msgstr "" #: wizard_field:account.third_party_ledger.report,init,result_selection:0 #: field:wizard.company.setup,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Харилцагч" #. module: account #: help:account.invoice,number:0 @@ -2042,39 +2057,39 @@ msgstr "" #. module: account #: model:account.account.type,name:account.account_type_expense msgid "Expense" -msgstr "" +msgstr "Зарлага" #. module: account #: field:account.journal,invoice_sequence_id:0 msgid "Invoice Sequence" -msgstr "" +msgstr "Нэхэмжлэлийн дугаарлалт" #. module: account #: wizard_view:account.automatic.reconcile,init:0 msgid "Options" -msgstr "" +msgstr "Өгөгдлүүд" #. module: account #: model:process.process,name:account.process_process_invoiceprocess0 msgid "Customer Invoice Process" -msgstr "" +msgstr "Худалдан авагчийн нэхэмжлэлийн явц" #. module: account #: rml:account.invoice:0 msgid "Fiscal Position Remark :" -msgstr "" +msgstr "Фискал посишион тайлбар :" #. module: account #: wizard_field:account.fiscalyear.close,init,period_id:0 msgid "Opening Entries Period" -msgstr "" +msgstr "Нээлтийн гүйлгээний мөчлөг" #. module: account #: model:ir.actions.wizard,name:account.wizard_validate_account_moves #: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line #: model:ir.ui.menu,name:account.menu_validate_account_moves msgid "Validate Account Moves" -msgstr "" +msgstr "Гүйлгээ батлах" #. module: account #: selection:account.subscription,period_type:0 @@ -2098,23 +2113,23 @@ msgstr "" #: field:account.model.line,currency_id:0 #: field:account.move.line,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Валют" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened msgid "Unpaid invoices" -msgstr "" +msgstr "Төлөгдөөгүй нэхэмжлэлүүд" #. module: account #: model:process.transition,name:account.process_transition_paymentreconcile0 msgid "Payment Reconcile" -msgstr "" +msgstr "Төлбөрийн тулгалт хийх" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree msgid "Statements reconciliation" -msgstr "" +msgstr "Тулгалтын хуулга" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -2125,24 +2140,24 @@ msgstr "" #. module: account #: view:account.payment.term:0 msgid "Computation" -msgstr "" +msgstr "Тооцоололт" #. module: account #: view:account.analytic.line:0 msgid "Analytic Entry" -msgstr "" +msgstr "Аналитик гүйлгээ" #. module: account #: view:res.company:0 #: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" -msgstr "" +msgstr "Төлбөр шаардах зурвас" #. module: account #: model:ir.actions.act_window,name:account.action_tax_code_tree #: model:ir.ui.menu,name:account.menu_action_tax_code_tree msgid "Chart of Taxes" -msgstr "" +msgstr "Татварын мод" #. module: account #: field:account.payment.term.line,value_amount:0 @@ -2152,49 +2167,49 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open msgid "Reconciled entries" -msgstr "" +msgstr "Нэгтгэсэн бичилтүүд" #. module: account #: field:account.invoice,address_contact_id:0 msgid "Contact Address" -msgstr "" +msgstr "Холбогдох хаяг" #. module: account #: view:account.fiscalyear:0 msgid "Create 3 Months Periods" -msgstr "" +msgstr "3 сарын мөчлөг үүсгэх" #. module: account #: view:account.invoice:0 msgid "(keep empty to use the current period)" -msgstr "" +msgstr "(Хоосон орхивол батлагдсан огноон мөчлөг.)" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree8 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8 msgid "Draft Supplier Invoices" -msgstr "" +msgstr "Нийлүүлэгчийн ноорог нэхэмжлэл" #. module: account #: wizard_field:account.invoice.refund,init,period:0 msgid "Force period" -msgstr "" +msgstr "Мөчлөг" #. module: account #: selection:account.account.type,close_method:0 msgid "Detail" -msgstr "" +msgstr "Задаргаа" #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 msgid "Consolidation" -msgstr "" +msgstr "Нэгтгэл" #. module: account #: field:account.chart.template,account_root_id:0 msgid "Root Account" -msgstr "" +msgstr "Толгой данс" #. module: account #: rml:account.overdue:0 @@ -2216,7 +2231,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_account_tree #: model:ir.ui.menu,name:account.menu_action_account_tree2 msgid "Chart of Accounts" -msgstr "" +msgstr "Дансны мод" #. module: account #: model:account.journal,name:account.check_journal @@ -2232,22 +2247,22 @@ msgstr "" #. module: account #: wizard_field:account.fiscalyear.close,init,journal_id:0 msgid "Opening Entries Journal" -msgstr "" +msgstr "Нээлтийн гүйлгээний журнал" #. module: account #: view:account.config.wizard:0 msgid "Create a Fiscal Year" -msgstr "" +msgstr "Санхүүгийн жил үүсгэх" #. module: account #: field:product.template,taxes_id:0 msgid "Customer Taxes" -msgstr "" +msgstr "Үйлчлүүлэгчийн татварууд" #. module: account #: field:account.invoice,date_invoice:0 msgid "Date Invoiced" -msgstr "" +msgstr "Нэхэмжилсэн огноо" #. module: account #: help:account.account.balance.report,checktype,periods:0 @@ -2256,12 +2271,12 @@ msgstr "" #: help:account.third_party_ledger.report,init,periods:0 #: help:account.vat.declaration,init,periods:0 msgid "All periods if empty" -msgstr "" +msgstr "All periods if empty" #. module: account #: model:account.account.type,name:account.account_type_liability msgid "Liability" -msgstr "" +msgstr "Үүрэг" #. module: account #: selection:account.automatic.reconcile,init,power:0 @@ -2272,11 +2287,12 @@ msgstr "" #: wizard_view:account.chart,init:0 msgid "(If you do not select Fiscal year it will take all open fiscal years)" msgstr "" +"(Санхүүгийн жилийг сонгоогүй бол бүх нээлттэй санхүүгийн жилүүд сонгогдоно)" #. module: account #: help:account.invoice.tax,base_code_id:0 msgid "The account basis of the tax declaration." -msgstr "" +msgstr "Татварын зарлалтын суурь данс." #. module: account #: rml:account.analytic.account.journal:0 @@ -2301,24 +2317,24 @@ msgstr "" #. module: account #: field:account.invoice,reference_type:0 msgid "Reference Type" -msgstr "" +msgstr "Дугаарлалтын төрөл" #. module: account #: wizard_button:account.move.line.unreconcile,init,unrec:0 #: wizard_button:account.reconcile.unreconcile,init,unrec:0 msgid "Unreconcile" -msgstr "" +msgstr "Үл тулгалт хийх" #. module: account #: field:account.tax,type:0 #: field:account.tax.template,type:0 msgid "Tax Type" -msgstr "" +msgstr "Татварын төрөл" #. module: account #: model:process.transition,name:account.process_transition_statemententries0 msgid "Statement Entries" -msgstr "" +msgstr "Гүйлгээнүүдийн хуулга" #. module: account #: field:account.analytic.line,user_id:0 @@ -2330,12 +2346,12 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_template_form #: model:ir.ui.menu,name:account.menu_action_account_template_form msgid "Account Templates" -msgstr "" +msgstr "Дансны загвар" #. module: account #: view:account.chart.template:0 msgid "Chart of Accounts Template" -msgstr "" +msgstr "Дансны модны загвар" #. module: account #: model:account.journal,name:account.refund_sales_journal @@ -2345,38 +2361,38 @@ msgstr "" #. module: account #: rml:account.journal.period.print:0 msgid "Voucher No" -msgstr "" +msgstr "Хувьцааны бичиг №" #. module: account #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile #: model:ir.ui.menu,name:account.menu_automatic_reconcile msgid "Automatic reconciliation" -msgstr "" +msgstr "Автомат тулгалт" #. module: account #: view:account.bank.statement:0 msgid "Import Invoice" -msgstr "" +msgstr "Нэхэмжлэл оруулах" #. module: account #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 msgid "and Journals" -msgstr "" +msgstr "болон журналууд" #. module: account #: view:account.tax:0 msgid "Account Tax" -msgstr "" +msgstr "Дэд татвар" #. module: account #: field:account.analytic.line,move_id:0 msgid "Move Line" -msgstr "" +msgstr "Журналын бичилт" #. module: account #: field:account.bank.accounts.wizard,acc_no:0 msgid "Account No." -msgstr "" +msgstr "Дансны №." #. module: account #: help:account.tax,child_depend:0 @@ -2384,11 +2400,13 @@ msgid "" "Set if the tax computation is based on the computation of child taxes rather " "than on the total amount." msgstr "" +"Тухайн татварыг дэд татваруудаар тооцоологдсон нийт дүн дээр нэмж тооцоолох " +"эсэх. Үгүй бол үндсэн дүн дээр тооцоолно." #. module: account #: rml:account.central.journal:0 msgid "Journal Code" -msgstr "" +msgstr "Журналын код" #. module: account #: help:account.tax,applicable_type:0 @@ -2396,6 +2414,8 @@ msgid "" "If not applicable (computed through a Python code), the tax won't appear on " "the invoice." msgstr "" +"Хэрэв програмчлалаар тооцоологдох бол тухайн татвар нэхэмжлэл дээр " +"тусгагдахгүй." #. module: account #: field:account.model,lines_id:0 @@ -2405,7 +2425,7 @@ msgstr "" #. module: account #: field:account.analytic.account,date:0 msgid "Date End" -msgstr "" +msgstr "Дуусах огноо" #. module: account #: view:account.bank.statement:0 @@ -2414,18 +2434,18 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_move_line_tree1 #: model:ir.ui.menu,name:account.menu_action_move_line_search msgid "Entry Lines" -msgstr "" +msgstr "Журналын бичилтүүд" #. module: account #: view:account.tax:0 #: view:account.tax.template:0 msgid "Applicable Code (if type=code)" -msgstr "" +msgstr "Хэрэглэх програмчлалын код (хэрэв төрөл=програмчлал)" #. module: account #: wizard_button:account.move.journal,init,open:0 msgid "Open Journal" -msgstr "" +msgstr "Журнал нээх" #. module: account #: rml:account.analytic.account.journal:0 @@ -2438,12 +2458,12 @@ msgstr "" #: model:ir.ui.menu,name:account.account_entries_analytic_entries #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form msgid "Entries Encoding by Line" -msgstr "" +msgstr "Журналын бичилтүүд" #. module: account #: help:account.chart.template,tax_template_ids:0 msgid "List of all the taxes that have to be installed by the wizard" -msgstr "" +msgstr "Шинээр үүсгэх татваруудын жагсаалт" #. module: account #: rml:account.analytic.account.cost_ledger:0 @@ -2456,7 +2476,7 @@ msgstr "" #: model:process.node,name:account.process_node_bankstatement0 #: model:process.node,name:account.process_node_supplierbankstatement0 msgid "Bank Statement" -msgstr "" +msgstr "Банкны хуулга" #. module: account #: wizard_view:account.invoice.pay,addendum:0 @@ -2468,23 +2488,23 @@ msgstr "" #: model:process.transition,name:account.process_transition_entriesreconcile0 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0 msgid "Entries Reconcile" -msgstr "" +msgstr "Гүйлгээнүүдийн тулгалт" #. module: account #: help:account.bank.statement.reconcile,total_second_amount:0 msgid "The amount in the currency of the journal" -msgstr "" +msgstr "Журналын валютаар тооцсон дүн" #. module: account #: wizard_field:account.general.ledger.report,checktype,landscape:0 msgid "Landscape Mode" -msgstr "" +msgstr "Хэвтээ горим" #. module: account #: model:process.transition,note:account.process_transition_analyticinvoice0 #: model:process.transition,note:account.process_transition_supplieranalyticcost0 msgid "From analytic accounts, Create invoice." -msgstr "" +msgstr "Аналитизк дансаас нэхэмжлэл үүсгэх." #. module: account #: wizard_button:account.account.balance.report,account_selection,end:0 @@ -2533,12 +2553,12 @@ msgstr "" #: view:wizard.company.setup:0 #: view:wizard.multi.charts.accounts:0 msgid "Cancel" -msgstr "" +msgstr "Болих" #. module: account #: field:account.account.type,name:0 msgid "Acc. Type Name" -msgstr "" +msgstr "Дансны төрлийн нэр" #. module: account #: help:account.tax,base_code_id:0 @@ -2550,7 +2570,7 @@ msgstr "" #: help:account.tax.template,ref_tax_code_id:0 #: help:account.tax.template,tax_code_id:0 msgid "Use this code for the VAT declaration." -msgstr "" +msgstr "Уг ангилал нь татварын зарлалтанд хэрэглэгдэнэ." #. module: account #: field:account.move.line,blocked:0 @@ -2562,32 +2582,32 @@ msgstr "" #: wizard_view:account.move.validate,init:0 #: view:account.payment.term:0 msgid "Information" -msgstr "" +msgstr "Мэдээлэл" #. module: account #: model:ir.ui.menu,name:account.menu_tax_report msgid "Taxes Reports" -msgstr "" +msgstr "Татваруудын мэдээлэлүүд" #. module: account #: field:res.partner,property_account_payable:0 msgid "Account Payable" -msgstr "" +msgstr "Өглөгийн данс" #. module: account #: wizard_view:populate_statement_from_inv,init:0 msgid "Import Invoices in Statement" -msgstr "" +msgstr "Нэхэмжлэлүүдийн хуулгыг оруулах" #. module: account #: view:account.invoice:0 msgid "Other Info" -msgstr "" +msgstr "Бусад мэдээлэл" #. module: account #: field:account.journal,default_credit_account_id:0 msgid "Default Credit Account" -msgstr "" +msgstr "Тогтсон кредит данс" #. module: account #: model:process.node,name:account.process_node_supplierpaymentorder0 @@ -2599,6 +2619,7 @@ msgstr "" msgid "" "Check this option if you want the user to reconcile entries in this account." msgstr "" +"Хэрэглэгч уг дансны гүйлгээг банкны хуулгатай тулган тааруулж болох эсэх." #. module: account #: rml:account.analytic.account.journal:0 @@ -2606,12 +2627,12 @@ msgstr "" #: model:process.node,name:account.process_node_analytic0 #: model:process.node,name:account.process_node_analyticcost0 msgid "Analytic" -msgstr "" +msgstr "Аналитик" #. module: account #: model:process.node,name:account.process_node_invoiceinvoice0 msgid "Create Invoice" -msgstr "" +msgstr "Нэхэмжлэл үүсгэх" #. module: account #: model:account.account.type,name:account.account_type_cash_equity @@ -2626,7 +2647,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax_code_template msgid "Tax Code Template" -msgstr "" +msgstr "Татварын ангилалын загвар" #. module: account #: rml:account.partner.balance:0 @@ -2642,31 +2663,38 @@ msgid "" "partners accounts (for debit/credit computations), closed for deprecated " "accounts." msgstr "" +"Энэ төрөл нь тухайн данс хаана хэрхэн хэрэглэгдэхийг тодорхойлно: \\n\r\n" +" харах төрөлтэй дансанд гүйлгээ бичихгүй зөвхөн дансны модыг тодорхойлох " +"зорилготой\\n\r\n" +" нэгтгэх төрөлтэй данс нь олон компаний дансуудыг өөртөө нэгтгэж тайлагнах " +"зорилготой\\n\r\n" +" өглөг, авлага төрөлтэй данс нь харилцагчийн гүйлгээнд хэрэглэгдэнэ\\n\r\n" +" хаагдсан төрөлтэй данс нь хэрэглэгдэхээ больсон гэсэн үг юм." #. module: account #: model:ir.ui.menu,name:account.menu_account_end_year_treatments msgid "End of Year Treatments" -msgstr "" +msgstr "Жилийн төгсгөлийн боловсруулалт" #. module: account #: model:ir.ui.menu,name:account.menu_generic_report msgid "Generic Reports" -msgstr "" +msgstr "Ерөнхий тайлангууд" #. module: account #: wizard_field:account.automatic.reconcile,init,power:0 msgid "Power" -msgstr "" +msgstr "Хүч" #. module: account #: wizard_view:account.analytic.line,init:0 msgid "Account Analytic Lines Analysis" -msgstr "" +msgstr "Аналитик дансны бичилт шинжилгээ" #. module: account #: rml:account.invoice:0 msgid "Price" -msgstr "" +msgstr "Үнэ" #. module: account #: rml:account.analytic.account.journal:0 @@ -2687,27 +2715,27 @@ msgstr "" #: model:ir.ui.menu,name:account.account_analytic_def_chart #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2 msgid "Analytic Chart of Accounts" -msgstr "" +msgstr "Аналитик дансны мод" #. module: account #: wizard_view:account.analytic.line,init:0 msgid "View Account Analytic Lines" -msgstr "" +msgstr "Аналитик дансны бичилтийн харагдац" #. module: account #: wizard_view:account.move.validate,init:0 msgid "Select Period and Journal for Validation" -msgstr "" +msgstr "Батлах шаардлагатай мөчлөг болон журналыг сонгох" #. module: account #: field:account.invoice,number:0 msgid "Invoice Number" -msgstr "" +msgstr "Нэхэмжлэлийн дугаар" #. module: account #: field:account.period,date_stop:0 msgid "End of Period" -msgstr "" +msgstr "Мөчлөг дуусах" #. module: account #: wizard_button:populate_statement_from_inv,go,finish:0 @@ -2717,24 +2745,24 @@ msgstr "" #. module: account #: field:account.invoice,amount_untaxed:0 msgid "Untaxed" -msgstr "" +msgstr "Татвар ноогдохүй" #. module: account #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report msgid "Inverted Analytic Balance" -msgstr "" +msgstr "Тонгоруулсан аналитик баланс" #. module: account #: field:account.tax,applicable_type:0 #: field:account.tax.template,applicable_type:0 msgid "Applicable Type" -msgstr "" +msgstr "Хэрэглэх төрөл" #. module: account #: field:account.invoice,reference:0 msgid "Invoice Reference" -msgstr "" +msgstr "Нэхэмжлэлийн дугаарлалт" #. module: account #: field:account.account,name:0 @@ -2750,7 +2778,7 @@ msgstr "" #: field:account.move.reconcile,name:0 #: field:account.subscription,name:0 msgid "Name" -msgstr "" +msgstr "Нэр" #. module: account #: wizard_view:account.move.line.reconcile,init_full:0 @@ -2776,7 +2804,7 @@ msgstr "" #. module: account #: field:account.move.line,date:0 msgid "Effective date" -msgstr "" +msgstr "Огноо" #. module: account #: help:account.tax.template,sequence:0 @@ -2785,6 +2813,9 @@ msgid "" "higher ones. The order is important if you have a tax that has several tax " "children. In this case, the evaluation order is important." msgstr "" +"Нэг татварын дотор орших дэд татваруудын хувьд аль нь эхэлж тооцоологдохыг " +"илэрхийлэх эрэмбэ буюу дараалал. Татварууд бага эрэмбээсээ эхэлж " +"тооцоологдоно." #. module: account #: field:account.journal.column,view_id:0 @@ -2792,7 +2823,7 @@ msgstr "" #: field:account.journal.view,name:0 #: model:ir.model,name:account.model_account_journal_view msgid "Journal View" -msgstr "" +msgstr "Журналын харагдац" #. module: account #: selection:account.move.line,centralisation:0 @@ -2802,12 +2833,12 @@ msgstr "" #. module: account #: rml:account.overdue:0 msgid "Customer Ref:" -msgstr "" +msgstr "Худалдан авагчийн дугаар" #. module: account #: xsl:account.transfer:0 msgid "Partner ID" -msgstr "" +msgstr "Харилцагчийн дугаар" #. module: account #: wizard_view:account.automatic.reconcile,init:0 @@ -2819,13 +2850,13 @@ msgstr "" #. module: account #: view:account.move.line:0 msgid "Total credit" -msgstr "" +msgstr "Нийт кредит" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree1_new #: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new msgid "New Customer Invoice" -msgstr "" +msgstr "Шинэ худалдан авагчийн нэхэмжлэл" #. module: account #: field:account.account,reconcile:0 @@ -2837,22 +2868,22 @@ msgstr "" #: wizard_button:account.move.line.reconcile,addendum,reconcile:0 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0 msgid "Reconcile" -msgstr "" +msgstr "Банкны тулгалт" #. module: account #: rml:account.overdue:0 msgid "Best regards." -msgstr "" +msgstr "Хүндэтгэсэн." #. module: account #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal msgid "Analytic account costs and revenues" -msgstr "" +msgstr "Аналитик дансны зардал болон орлого" #. module: account #: wizard_view:account.invoice.refund,init:0 msgid "Are you sure you want to refund this invoice ?" -msgstr "" +msgstr "Та энэ нэхэмжлэлийг буцаахдаа итгэлтэй байна уу?" #. module: account #: model:ir.actions.wizard,name:account.wizard_paid_open @@ -2862,7 +2893,7 @@ msgstr "" #. module: account #: field:account.journal,entry_posted:0 msgid "Skip 'Draft' State for Created Entries" -msgstr "" +msgstr "Үүссэн гүйлгээг шууд батлах" #. module: account #: field:account.invoice.tax,account_id:0 @@ -2873,12 +2904,12 @@ msgstr "Татварын данс" #. module: account #: model:process.transition,note:account.process_transition_statemententries0 msgid "From statement, create entries" -msgstr "" +msgstr "Хуулгаас гүйлгээнүүдийг үүсгэх" #. module: account #: field:account.analytic.account,complete_name:0 msgid "Full Account Name" -msgstr "" +msgstr "Дансны бүтэн нэр" #. module: account #: rml:account.account.balance:0 @@ -2892,54 +2923,54 @@ msgstr "" #: rml:account.third_party_ledger_other:0 #: rml:account.vat.declaration:0 msgid "1cm 27.7cm 20cm 27.7cm" -msgstr "" +msgstr "1см 27.7см 20см 27.7см" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree12 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12 msgid "Draft Supplier Refunds" -msgstr "" +msgstr "Нийлүүлэгчийн ноорог буцаалт" #. module: account #: model:process.node,name:account.process_node_accountingstatemententries0 msgid "Accounting Statement" -msgstr "" +msgstr "Дансны хуулга" #. module: account #: rml:account.overdue:0 msgid "Document: Customer account statement" -msgstr "" +msgstr "Баримт: Худалдан авагчийн дансны хуулга" #. module: account #: view:product.product:0 #: view:product.template:0 #: view:res.partner:0 msgid "Accounting" -msgstr "" +msgstr "Санхүү бүртгэл" #. module: account #: view:account.fiscal.position.template:0 msgid "Taxes Mapping" -msgstr "" +msgstr "Татваруудын зурагжуулалт" #. module: account #: wizard_view:account.move.line.unreconcile,init:0 #: wizard_view:account.reconcile.unreconcile,init:0 msgid "Unreconciliation transactions" -msgstr "" +msgstr "Тулгагдаагүй гүйлгээнүүд" #. module: account #: model:process.transition,note:account.process_transition_paymentorderbank0 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0 msgid "Reconcilation of entries from payment order." -msgstr "" +msgstr "Төлбөрийн ордероос гүйлгээнүүдийн тулгалт." #. module: account #: field:account.bank.statement,move_line_ids:0 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line #: model:ir.model,name:account.model_account_move_line msgid "Entry lines" -msgstr "" +msgstr "Журналын бичилтүүд" #. module: account #: wizard_view:account.automatic.reconcile,init:0 @@ -2950,7 +2981,7 @@ msgstr "" #: model:process.node,name:account.process_node_reconciliation0 #: model:process.node,name:account.process_node_supplierreconciliation0 msgid "Reconciliation" -msgstr "" +msgstr "Тулгагдсан бичилтүүд" #. module: account #: field:account.move.line,centralisation:0 @@ -2964,33 +2995,33 @@ msgstr "" #: field:account.tax.template,tax_code_id:0 #: model:ir.model,name:account.model_account_tax_code msgid "Tax Code" -msgstr "" +msgstr "Татварын ангилал" #. module: account #: rml:account.analytic.account.journal:0 msgid "Analytic Journal -" -msgstr "" +msgstr "Аналитик журнал -" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Analytic Debit" -msgstr "" +msgstr "Аналитик дебит" #. module: account #: field:account.account,currency_mode:0 msgid "Outgoing Currencies Rate" -msgstr "" +msgstr "Гаралтын валютын ханш" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree10 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10 msgid "Draft Customer Refunds" -msgstr "" +msgstr "Худалдан авагчийн ноорог буцаалт" #. module: account #: field:account.journal.column,readonly:0 msgid "Readonly" -msgstr "" +msgstr "Зөвхөн харах" #. module: account #: help:account.model.line,date_maturity:0 @@ -3004,28 +3035,28 @@ msgstr "" #: selection:account.analytic.journal,type:0 #: selection:account.journal,type:0 msgid "Situation" -msgstr "" +msgstr "Орон байрлал" #. module: account #: rml:account.invoice:0 #: xsl:account.transfer:0 msgid "Document" -msgstr "" +msgstr "Баримт бичиг" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "" +msgstr "Уг журналын бичилтийг агуулж буй ажил гүйлгээ." #. module: account #: field:account.invoice.line,uos_id:0 msgid "Unit of Measure" -msgstr "" +msgstr "Хэмжих нэгж" #. module: account #: field:account.chart.template,property_account_receivable:0 msgid "Receivable Account" -msgstr "" +msgstr "Авлагын данс" #. module: account #: help:account.journal,group_invoice_lines:0 @@ -3033,6 +3064,8 @@ msgid "" "If this box is checked, the system will try to group the accounting lines " "when generating them from invoices." msgstr "" +"Хэрэв үүнийг сонговол нэхэмжлэлээс үүдэлтэй гүйлгээний бичилтүүдийг систем " +"нэхэмжлэлийн дагуу нэгтгэх гэж оролдоно." #. module: account #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0 @@ -3043,7 +3076,7 @@ msgstr "" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel msgid "Cancel selected invoices" -msgstr "" +msgstr "Сонгогдсон нэхэмжлэлүүдийг цуцлах" #. module: account #: view:account.analytic.journal:0 @@ -3052,12 +3085,12 @@ msgstr "" #: model:ir.actions.report.xml,name:account.analytic_journal_print #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report msgid "Analytic Journal" -msgstr "" +msgstr "Аналитик журнал" #. module: account #: rml:account.general.ledger:0 msgid "Entry Label" -msgstr "" +msgstr "Гүйлгээний нэр" #. module: account #: model:process.transition,note:account.process_transition_paymentreconcile0 @@ -3074,37 +3107,37 @@ msgstr "" #: view:account.period:0 #: view:account.subscription:0 msgid "Set to Draft" -msgstr "" +msgstr "Ноорог болгох" #. module: account #: help:account.invoice,origin:0 #: help:account.invoice.line,origin:0 msgid "Reference of the document that produced this invoice." -msgstr "" +msgstr "Reference of the document that produced this invoice." #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Payable" -msgstr "" +msgstr "Өглөг" #. module: account #: rml:account.invoice:0 #: field:account.invoice.tax,base:0 msgid "Base" -msgstr "" +msgstr "Суурь" #. module: account #: field:account.model,name:0 msgid "Model Name" -msgstr "" +msgstr "Моделийн нэр" #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 msgid "Others" -msgstr "" +msgstr "Бусад" #. module: account #: selection:account.automatic.reconcile,init,power:0 @@ -3116,7 +3149,7 @@ msgstr "" #: view:account.move:0 #: wizard_button:account.move.validate,init,validate:0 msgid "Validate" -msgstr "" +msgstr "Батлах" #. module: account #: view:account.model:0 @@ -3150,7 +3183,7 @@ msgstr "" #: wizard_field:account.move.line.unreconcile.select,init,account_id:0 #: model:ir.model,name:account.model_account_account msgid "Account" -msgstr "" +msgstr "Данс" #. module: account #: model:account.journal,name:account.bank_journal @@ -3163,7 +3196,7 @@ msgstr "" #: selection:account.partner.balance.report,init,state:0 #: selection:account.third_party_ledger.report,init,state:0 msgid "By Date and Period" -msgstr "" +msgstr "Огноо болон мөчлөгөөр" #. module: account #: view:account.account:0 @@ -3174,7 +3207,7 @@ msgstr "" #: view:account.invoice.line:0 #: field:account.invoice.line,note:0 msgid "Notes" -msgstr "" +msgstr "Тэмдэглэлүүд" #. module: account #: help:account.invoice,reconciled:0 @@ -3191,17 +3224,17 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_tax_form #: model:ir.ui.menu,name:account.next_id_27 msgid "Taxes" -msgstr "" +msgstr "Татварууд" #. module: account #: wizard_view:account.fiscalyear.close,init:0 msgid "Close Fiscal Year with new entries" -msgstr "" +msgstr "Шинэ гүйлгээ үүсгэж санхүүгийн жил хаах" #. module: account #: selection:account.account,currency_mode:0 msgid "Average Rate" -msgstr "" +msgstr "Дундаж ханшаар" #. module: account #: model:process.node,note:account.process_node_bankstatement0 @@ -3226,12 +3259,12 @@ msgstr "" #: rml:account.partner.balance:0 #: field:account.period,code:0 msgid "Code" -msgstr "" +msgstr "Код" #. module: account #: model:ir.ui.menu,name:account.menu_finance msgid "Financial Management" -msgstr "" +msgstr "Санхүүгийн менежмент" #. module: account #: selection:account.account.type,close_method:0 @@ -3244,12 +3277,12 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close #: model:ir.ui.menu,name:account.menu_wizard_fy_close msgid "Generate Fiscal Year Opening Entries" -msgstr "" +msgstr "Нээлтийн гүйлгээтэй санхүүгийн жил үүсгэх" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile msgid "Reconcile Entries" -msgstr "" +msgstr "Гүйлгээг тулгалт хийх" #. module: account #: wizard_view:account.wizard_paid_open,init:0 @@ -3259,29 +3292,29 @@ msgstr "" #. module: account #: view:account.invoice:0 msgid "Additionnal Information" -msgstr "" +msgstr "Нэмэлт мэдээлэл" #. module: account #: field:account.tax,name:0 #: field:account.tax.template,name:0 #: rml:account.vat.declaration:0 msgid "Tax Name" -msgstr "" +msgstr "Татварын нэр" #. module: account #: wizard_view:account.fiscalyear.close.state,init:0 msgid " Close states of Fiscal year and periods" -msgstr "" +msgstr " Санхүүгийн жил болон мөчлөгүүдийн төлвийг хаах" #. module: account #: model:account.payment.term,name:account.account_payment_term msgid "30 Days End of Month" -msgstr "" +msgstr "Сарын төгөсгөл 30 өдөр" #. module: account #: field:account.chart.template,tax_code_root_id:0 msgid "Root Tax Code" -msgstr "" +msgstr "Толгой татварын ангилал" #. module: account #: constraint:account.invoice:0 @@ -3292,44 +3325,44 @@ msgstr "" #: field:account.tax.code,notprintable:0 #: field:account.tax.code.template,notprintable:0 msgid "Not Printable in Invoice" -msgstr "" +msgstr "Нэхэмжлэлд тусгагдахгүй" #. module: account #: field:account.move.line,move_id:0 msgid "Move" -msgstr "" +msgstr "Ажил гүйлгээ" #. module: account #: field:account.fiscal.position.tax,tax_src_id:0 #: field:account.fiscal.position.tax.template,tax_src_id:0 msgid "Tax Source" -msgstr "" +msgstr "Эх татвар" #. module: account #: model:ir.actions.report.xml,name:account.account_analytic_account_balance #: model:ir.actions.wizard,name:account.account_analytic_account_balance_report msgid "Analytic Balance" -msgstr "" +msgstr "Аналитик баланс" #. module: account #: view:account.move.line:0 msgid "Total debit" -msgstr "" +msgstr "Нийт дебит" #. module: account #: selection:account.analytic.account,state:0 msgid "Pending" -msgstr "" +msgstr "Хүлээсэн" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Bank Information" -msgstr "" +msgstr "Банкны мэдээлэл" #. module: account #: rml:account.invoice:0 msgid "Fax :" -msgstr "" +msgstr "факс :" #. module: account #: rml:account.partner.balance:0 @@ -3337,7 +3370,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_partner_balance_report #: model:ir.ui.menu,name:account.menu_partner_balance msgid "Partner Balance" -msgstr "" +msgstr "Харилцагчийн баланс" #. module: account #: rml:account.third_party_ledger:0 @@ -3350,7 +3383,7 @@ msgstr "" msgid "" "This account will be used instead of the default one as the receivable " "account for the current partner" -msgstr "" +msgstr "Энэ бол тухайн харилцагчийн авлагын бичилт хийх тогтсон данс юм" #. module: account #: selection:account.tax,applicable_type:0 @@ -3362,17 +3395,17 @@ msgstr "" #: field:account.tax.template,python_compute:0 #: selection:account.tax.template,type:0 msgid "Python Code" -msgstr "" +msgstr "Програмчлал" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement msgid "Bank statements" -msgstr "" +msgstr "Банкны хуулга" #. module: account #: model:ir.ui.menu,name:account.next_id_22 msgid "Partner Accounts" -msgstr "" +msgstr "Харилцагчийн дансууд" #. module: account #: help:account.tax.template,tax_group:0 @@ -3380,23 +3413,25 @@ msgid "" "If a default tax if given in the partner it only override taxes from account " "(or product) of the same group." msgstr "" +"Хэрэв харилцагч дээр тогтсон татвар сонгосон бол тухайн татвартай ижил " +"группийн татваруудаас сонгох боломжтой байна." #. module: account #: view:account.bank.statement:0 msgid "Real Entries" -msgstr "" +msgstr "Жинхэнэ гүйлгээнүүд" #. module: account #: model:process.node,name:account.process_node_importinvoice0 msgid "Import invoice" -msgstr "" +msgstr "Нэхэмжлэл оруулах" #. module: account #: view:account.invoice:0 #: view:wizard.company.setup:0 #: view:wizard.multi.charts.accounts:0 msgid "Create" -msgstr "" +msgstr "Үүсгэх" #. module: account #: model:process.transition.action,name:account.process_transition_action_createentries0 @@ -3406,13 +3441,13 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_invoice_line msgid "Invoice line" -msgstr "" +msgstr "Нэхэмжлэлийн гүйлгээ" #. module: account #: field:account.account,shortcut:0 #: field:account.account.template,shortcut:0 msgid "Shortcut" -msgstr "" +msgstr "Богино холбоос" #. module: account #: wizard_view:account.move.validate,init:0 @@ -3420,6 +3455,8 @@ msgid "" "All draft account entries in this journal and period will be validated. It " "means you won't be able to modify their accouting fields." msgstr "" +"Тухайн журналын тухайн мөчлөгөд бичигдсэн бүх ноорог бичилтүүдийг батална. " +"Ингэснээр тухайн бичилтүүдийг засварлах боломжгүй болно." #. module: account #: selection:account.model.line,date:0 @@ -3438,7 +3475,7 @@ msgstr "" #: field:account.tax,parent_id:0 #: field:account.tax.template,parent_id:0 msgid "Parent Tax Account" -msgstr "" +msgstr "Эцэг татварын данс" #. module: account #: field:account.account,user_type:0 @@ -3447,12 +3484,12 @@ msgstr "" #: field:account.analytic.account,type:0 #: model:ir.model,name:account.model_account_account_type msgid "Account Type" -msgstr "" +msgstr "Дансны төрөл" #. module: account #: view:res.partner:0 msgid "Bank account owner" -msgstr "" +msgstr "Банкны данс эзэмшигч" #. module: account #: wizard_view:account.account.balance.report,checktype:0 @@ -3460,23 +3497,23 @@ msgstr "" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "Filter on Periods" -msgstr "" +msgstr "Filter on Periods" #. module: account #: field:res.partner,property_account_receivable:0 msgid "Account Receivable" -msgstr "" +msgstr "Авлагын данс" #. module: account #: wizard_button:account.invoice.pay,addendum,reconcile:0 msgid "Pay and reconcile" -msgstr "" +msgstr "Өглөг ба тулгалт" #. module: account #: rml:account.central.journal:0 #: model:ir.actions.report.xml,name:account.account_central_journal msgid "Central Journal" -msgstr "" +msgstr "Төв журнал" #. module: account #: rml:account.third_party_ledger:0 @@ -3487,7 +3524,7 @@ msgstr "" #. module: account #: field:account.account,child_consol_ids:0 msgid "Consolidated Children" -msgstr "" +msgstr "Нэгтгэгдсэн дэд дансууд" #. module: account #: wizard_field:account.account.balance.report,checktype,fiscalyear:0 @@ -3496,18 +3533,18 @@ msgstr "" #: wizard_field:account.partner.balance.report,init,fiscalyear:0 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0 msgid "Fiscal year" -msgstr "" +msgstr "Санхүүгийн жил" #. module: account #: rml:account.overdue:0 msgid "Balance :" -msgstr "" +msgstr "Баланс :" #. module: account #: selection:account.account.balance.report,checktype,display_account:0 #: selection:account.general.ledger.report,checktype,display_account:0 msgid "With balance is not equal to 0" -msgstr "" +msgstr "Баланс нь тэгээс ялгаатай" #. module: account #: selection:account.automatic.reconcile,init,power:0 @@ -3517,33 +3554,33 @@ msgstr "" #. module: account #: model:ir.actions.report.xml,name:account.account_vat_declaration msgid "Taxes Report" -msgstr "" +msgstr "Татварын мэдээлэл" #. module: account #: selection:account.journal.period,state:0 msgid "Printed" -msgstr "" +msgstr "Хэвлэгдсэн" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree4_new #: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new msgid "New Supplier Refund" -msgstr "" +msgstr "Шинэ нийлүүлэгчийн буцаалт" #. module: account #: view:account.model:0 msgid "Entry Model" -msgstr "" +msgstr "Гүйлгээний модель" #. module: account #: wizard_field:account.general.ledger.report,checktype,amount_currency:0 msgid "With Currency" -msgstr "" +msgstr "Валютаар" #. module: account #: view:account.account:0 msgid "Chart of accounts" -msgstr "" +msgstr "Дансны мод" #. module: account #: field:account.subscription.line,subscription_id:0 @@ -3553,18 +3590,18 @@ msgstr "" #. module: account #: field:account.analytic.journal,code:0 msgid "Journal code" -msgstr "" +msgstr "Журналын код" #. module: account #: wizard_button:account.fiscalyear.close,init,close:0 #: view:account.model:0 msgid "Create entries" -msgstr "" +msgstr "Гүйлгээ үүсгэх" #. module: account #: view:account.analytic.line:0 msgid "Project line" -msgstr "" +msgstr "Төслийн бичилт" #. module: account #: wizard_field:account.automatic.reconcile,init,max_amount:0 @@ -3574,35 +3611,35 @@ msgstr "" #. module: account #: field:account.invoice.tax,manual:0 msgid "Manual" -msgstr "" +msgstr "Гараар" #. module: account #: view:account.invoice:0 msgid "Compute Taxes" -msgstr "" +msgstr "Татваруудыг тооцоолох" #. module: account #: field:wizard.multi.charts.accounts,code_digits:0 msgid "# of Digits" -msgstr "" +msgstr "Оронгийн хэмжээ" #. module: account #: help:res.partner,property_payment_term:0 msgid "" "This payment term will be used instead of the default one for the current " "partner" -msgstr "" +msgstr "Тухайн харилцагчид хэрэглэгдэх тогтсон төлбөрийн нөхцөл" #. module: account #: wizard_field:account.invoice.pay,addendum,comment:0 #: wizard_field:account.invoice.pay,init,name:0 msgid "Entry Name" -msgstr "" +msgstr "Гүйлгээний нэр" #. module: account #: help:account.invoice,account_id:0 msgid "The partner account used for this invoice." -msgstr "" +msgstr "Уг нэхэмжлэл дээр хэрэглэгдэх харилцагчийн данс" #. module: account #: help:account.tax.code,notprintable:0 @@ -3611,6 +3648,8 @@ msgid "" "Check this box if you don't want any VAT related to this Tax Code to appear " "on invoices" msgstr "" +"Уг ангилалд хамрагдах татварууд нэхэмжлэл дээр тусгагдахгүй буюу татвар " +"тооцохгүй" #. module: account #: field:account.account.type,sequence:0 @@ -3623,28 +3662,28 @@ msgstr "" #: field:account.tax.template,sequence:0 #: field:fiscalyear.seq,sequence_id:0 msgid "Sequence" -msgstr "" +msgstr "Дугаарлалт" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template msgid "Template for Fiscal Position" -msgstr "" +msgstr "Санхүүгийн байршилын загвар" #. module: account #: view:account.bank.statement:0 msgid "Entry encoding" -msgstr "" +msgstr "Гүйлгээний жагсаалт" #. module: account #: wizard_view:account.invoice.refund,init:0 #: model:ir.actions.wizard,name:account.wizard_invoice_refund msgid "Credit Note" -msgstr "" +msgstr "Кредитийн тэмдэглэл" #. module: account #: model:ir.actions.todo,note:account.config_fiscalyear msgid "Define Fiscal Years and Select Charts of Account" -msgstr "" +msgstr "Санхүүгийн жилийг тодорхойлох болон дансны модыг сонгох" #. module: account #: wizard_field:account.move.line.reconcile,addendum,period_id:0 @@ -3654,12 +3693,12 @@ msgstr "" #. module: account #: selection:account.config.wizard,period:0 msgid "3 Months" -msgstr "" +msgstr "3 сар" #. module: account #: wizard_view:account.move.journal,init:0 msgid "Standard entries" -msgstr "" +msgstr "Стандарт гүйлгээнүүд" #. module: account #: help:account.account,check_history:0 @@ -3667,6 +3706,8 @@ msgid "" "Check this box if you want to print all entries when printing the General " "Ledger, otherwise it will only print its balance." msgstr "" +"Ерөнхий дэвтэр хэвлэх үед тухайн дансны бүх гүйлгээг хэвлэх эсэх, сонгохгүй " +"бол зөвхөн балансыг хэвлэнэ." #. module: account #: model:ir.model,name:account.model_account_payment_term_line @@ -3677,7 +3718,7 @@ msgstr "" #: selection:account.config.wizard,period:0 #: field:report.hr.timesheet.invoice.journal,name:0 msgid "Month" -msgstr "" +msgstr "Сар" #. module: account #: model:ir.model,name:account.model_account_subscription @@ -3689,7 +3730,7 @@ msgstr "" #: field:account.move.line,date_maturity:0 #: rml:account.overdue:0 msgid "Maturity date" -msgstr "" +msgstr "Maturity date" #. module: account #: view:account.subscription:0 @@ -3699,36 +3740,36 @@ msgstr "" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 msgid "By date" -msgstr "" +msgstr "Огноогоор" #. module: account #: model:ir.actions.act_window,name:account.action_account_config_wizard_form msgid "Account Configure Wizard " -msgstr "" +msgstr "Данс тохиргооны хэсэг " #. module: account #: field:account.config.wizard,date1:0 #: field:account.fiscalyear,date_start:0 #: field:account.subscription,date_start:0 msgid "Start Date" -msgstr "" +msgstr "Эхлэх огноо" #. module: account #: wizard_view:account.general.ledger.report,account_selection:0 msgid "Select Chart" -msgstr "" +msgstr "Мод сонгох" #. module: account #: selection:account.chart,init,target_move:0 #: model:ir.actions.report.xml,name:account.account_move_line_list msgid "All Entries" -msgstr "" +msgstr "All Entries" #. module: account #: model:process.node,name:account.process_node_draftinvoices0 #: model:process.node,name:account.process_node_supplierdraftinvoices0 msgid "Draft Invoices" -msgstr "" +msgstr "Ноорог нэхэмжлэлүүд" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template @@ -3738,18 +3779,18 @@ msgstr "" #. module: account #: rml:account.invoice:0 msgid "Invoice Date" -msgstr "" +msgstr "Нэхэмжилсэн огноо" #. module: account #: selection:account.account.type,close_method:0 msgid "Unreconciled" -msgstr "" +msgstr "Тулгагдаагүй гүйлгээ" #. module: account #: field:account.account,note:0 #: field:account.account.template,note:0 msgid "Note" -msgstr "" +msgstr "Тэмдэглэл" #. module: account #: model:ir.module.module,description:account.module_meta_information @@ -3768,13 +3809,13 @@ msgstr "" #. module: account #: field:account.journal,sequence_id:0 msgid "Entry Sequence" -msgstr "" +msgstr "Entry Sequence" #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 msgid "Closed" -msgstr "" +msgstr "Хаагдсан" #. module: account #: model:process.node,name:account.process_node_paymententries0 @@ -3785,13 +3826,14 @@ msgstr "" #: help:account.move.line,tax_code_id:0 msgid "The Account can either be a base tax code or tax code account." msgstr "" +"Уг данс нь татварын үндсэн данс эсвэл татварын ангилалын данс байж болно." #. module: account #: help:account.automatic.reconcile,init,account_ids:0 msgid "" "If no account is specified, the reconciliation will be made using every " "accounts that can be reconcilied" -msgstr "" +msgstr "Хэрэв данс сонгохгүй бол тулгалт хийх боломжтой бүх дансаар тулгана" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form @@ -3803,7 +3845,7 @@ msgstr "" #: selection:account.tax,tax_group:0 #: selection:account.tax.template,tax_group:0 msgid "Other" -msgstr "" +msgstr "Бусад" #. module: account #: model:ir.actions.report.xml,name:account.account_general_ledger @@ -3811,22 +3853,22 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_general_ledger_report #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" -msgstr "" +msgstr "Ерөнхий дэвтэр" #. module: account #: field:account.journal.view,columns_id:0 msgid "Columns" -msgstr "" +msgstr "Багана" #. module: account #: selection:account.general.ledger.report,checktype,sortbydate:0 msgid "Movement" -msgstr "" +msgstr "Гүйлгээ" #. module: account #: help:account.period,special:0 msgid "These periods can overlap." -msgstr "" +msgstr "Энэ мөчлөг дахин ашиглагдах эсэх." #. module: account #: help:product.template,property_account_expense:0 @@ -3834,6 +3876,8 @@ msgid "" "This account will be used instead of the default one to value outgoing stock " "for the current product" msgstr "" +"Энэ бол тухайн бараа материалын зарлага хийж буй нөөцийг бичих тогтсон данс " +"юм" #. module: account #: model:process.node,note:account.process_node_manually0 @@ -3844,7 +3888,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_journal_form #: model:ir.ui.menu,name:account.menu_action_account_journal_form msgid "Financial Journals" -msgstr "" +msgstr "Санхүүгийн журналууд" #. module: account #: selection:account.account.balance.report,checktype,state:0 @@ -3852,12 +3896,12 @@ msgstr "" #: selection:account.partner.balance.report,init,state:0 #: selection:account.third_party_ledger.report,init,state:0 msgid "By Period" -msgstr "" +msgstr "Мөчлөгөөр" #. module: account #: help:account.invoice,date_invoice:0 msgid "Keep empty to use the current date" -msgstr "" +msgstr "Хоосон орхивол одоогийн огноог хэрэглэнэ" #. module: account #: rml:account.overdue:0 @@ -3867,12 +3911,12 @@ msgstr "" #. module: account #: field:account.analytic.account,quantity_max:0 msgid "Maximum Quantity" -msgstr "" +msgstr "Дээд тоо хэмжээ" #. module: account #: field:account.period,name:0 msgid "Period Name" -msgstr "" +msgstr "Мөчлөгийн нэр" #. module: account #: help:account.analytic.journal,type:0 @@ -3881,16 +3925,19 @@ msgid "" "needs to create analytic entries, Open ERP will look for a matching journal " "of the same type." msgstr "" +"Аналитик журналын төрөл зүйл. Ямар нэгэн баримт (жш: нэхэмжлэл) дээр " +"аналитик гүйлгээ бичих шаардлагатай үед систем холбогдох журнал дээр " +"автоматаар бичилт хийнэ." #. module: account #: field:account.journal,groups_id:0 msgid "Groups" -msgstr "" +msgstr "Бүлгүүд" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Code/Date" -msgstr "" +msgstr "Код/Огноо" #. module: account #: field:account.account,active:0 @@ -3901,32 +3948,32 @@ msgstr "" #: field:account.payment.term,active:0 #: field:account.tax,active:0 msgid "Active" -msgstr "" +msgstr "Идэвхтэй" #. module: account #: model:process.node,note:account.process_node_electronicfile0 msgid "Import from your bank statements" -msgstr "" +msgstr "Таны банкны хуулгануудаас оруулах" #. module: account #: view:account.chart.template:0 msgid "Properties" -msgstr "" +msgstr "Нэмэлт Талбарууд" #. module: account #: view:res.partner:0 msgid "Customer Accounting Properties" -msgstr "" +msgstr "Худалдан авагчийн санхүү бүртгэл" #. module: account #: view:account.bank.statement:0 msgid "Select entries" -msgstr "" +msgstr "Гүйлгээг сонгох" #. module: account #: selection:account.chart,init,target_move:0 msgid "All Posted Entries" -msgstr "" +msgstr "Бүх батлагдсан гүйлгээнүүд" #. module: account #: wizard_field:account.vat.declaration,init,based_on:0 @@ -5922,3 +5969,332 @@ msgstr "" #: wizard_button:account.subscription.generate,init,generate:0 msgid "Compute Entry Dates" msgstr "" + +#. module: account +#: view:board.board:0 +msgid "Analytic accounts to close" +msgstr "" + +#. module: account +#: view:board.board:0 +msgid "Draft invoices" +msgstr "" + +#. module: account +#: model:ir.actions.act_window,name:account.open_board_account +#: model:ir.ui.menu,name:account.menu_board_account +msgid "Accounting Dashboard" +msgstr "" + +#. module: account +#: view:board.board:0 +#: model:ir.actions.act_window,name:account.act_my_account +msgid "Accounts to invoice" +msgstr "" + +#. module: account +#: view:board.board:0 +#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice +msgid "Costs to invoice" +msgstr "" + +#. module: account +#: view:board.board:0 +msgid "Aged receivables" +msgstr "" + +#. module: account +#: model:ir.module.module,shortdesc:account.module_meta_information +msgid "Board for accountant" +msgstr "" + +#. module: account +#: model:ir.actions.act_window,name:account.action_aged_income +msgid "Income Accounts" +msgstr "" + +#. module: account +#: view:board.board:0 +msgid "My indicators" +msgstr "" + +#. module: account +#: view:board.board:0 +msgid "Account Board" +msgstr "" + +#. module: account +#: view:board.board:0 +msgid "Aged income" +msgstr "" + +#. module: account +#: wizard_field:account.balance.account.balance.report,init,show_columns:0 +msgid "Show Debit/Credit Information" +msgstr "" + +#. module: account +#: selection:account.balance.account.balance.report,init,account_choice:0 +msgid "All accounts" +msgstr "" + +#. module: account +#: wizard_field:account.balance.account.balance.report,init,period_manner:0 +msgid "Entries Selection Based on" +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,backtoinit:0 +#: wizard_view:account.balance.account.balance.report,zero_years:0 +msgid "Notification" +msgstr "" + +#. module: account +#: selection:account.balance.account.balance.report,init,period_manner:0 +msgid "Financial Period" +msgstr "" + +#. module: account +#: model:ir.actions.report.xml,name:account.account_account_balance +#: model:ir.actions.report.xml,name:account.account_account_balance_landscape +msgid "Account balance" +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,init:0 +msgid "Select Period(s)" +msgstr "" + +#. module: account +#: selection:account.balance.account.balance.report,init,compare_pattern:0 +msgid "Percentage" +msgstr "" + +#. module: account +#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0 +msgid "Compare Selected Years In Terms Of" +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,init:0 +msgid "Select Fiscal Year(s)(Maximum Three Years)" +msgstr "" + +#. module: account +#: wizard_field:account.balance.account.balance.report,init,select_account:0 +msgid "Select Reference Account(for % comparision)" +msgstr "" + +#. module: account +#: model:ir.actions.wizard,name:account.wizard_account_balance_report +msgid "Account balance-Compare Years" +msgstr "" + +#. module: account +#: model:ir.module.module,description:account.module_meta_information +msgid "" +"Account Balance Module is an added functionality to the Financial Management " +"module.\n" +"\n" +" This module gives you the various options for printing balance sheet.\n" +"\n" +" 1. You can compare the balance sheet for different years.\n" +"\n" +" 2. You can set the cash or percentage comparison between two years.\n" +"\n" +" 3. You can set the referential account for the percentage comparison for " +"particular years.\n" +"\n" +" 4. You can select periods as an actual date or periods as creation " +"date.\n" +"\n" +" 5. You have an option to print the desired report in Landscape format.\n" +" " +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,backtoinit:0 +msgid "You have to select 'Landscape' option. Please Check it." +msgstr "" + +#. module: account +#: wizard_field:account.balance.account.balance.report,init,landscape:0 +msgid "Show Report in Landscape Form" +msgstr "" + +#. module: account +#: rml:account.account.balance.landscape:0 +#: rml:account.balance.account.balance:0 +msgid "Total :" +msgstr "" + +#. module: account +#: wizard_field:account.balance.account.balance.report,init,format_perc:0 +msgid "Show Comparision in %" +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,init:0 +msgid "Select Period" +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,init:0 +msgid "Report Options" +msgstr "" + +#. module: account +#: selection:account.balance.account.balance.report,init,compare_pattern:0 +msgid "Don't Compare" +msgstr "" + +#. module: account +#: wizard_field:account.balance.account.balance.report,init,account_choice:0 +msgid "Show Accounts" +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,backtoinit:0 +msgid "1. You have selected more than 3 years in any case." +msgstr "" + +#. module: account +#: model:ir.module.module,shortdesc:account.module_meta_information +msgid "Accounting and financial management-Compare Accounts" +msgstr "" + +#. module: account +#: rml:account.account.balance.landscape:0 +#: rml:account.balance.account.balance:0 +msgid "Year :" +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,backtoinit:0 +msgid "You can select maximum 3 years. Please check again." +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,backtoinit:0 +msgid "" +"3. You have selected 'Percentage' option with more than 2 years, but you " +"have not selected landscape format." +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,backtoinit:0 +msgid "" +"You might have done following mistakes. Please correct them and try again." +msgstr "" + +#. module: account +#: help:account.balance.account.balance.report,init,select_account:0 +msgid "Keep empty for comparision to its parent" +msgstr "" + +#. module: account +#: selection:account.balance.account.balance.report,init,period_manner:0 +msgid "Creation Date" +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,backtoinit:0 +msgid "" +"2. You have not selected 'Percentage' option, but you have selected more " +"than 2 years." +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,zero_years:0 +msgid "" +"You may have selected the compare options with more than 1 year with " +"credit/debit columns and % option.This can lead contents to be printed out " +"of the paper.Please try again." +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,zero_years:0 +msgid "You have to select at least 1 Fiscal Year. Try again." +msgstr "" + +#. module: account +#: wizard_view:account.balance.account.balance.report,init:0 +msgid "Customize Report" +msgstr "" + +#. module: account +#: field:report.aged.receivable,name:0 +msgid "Month Range" +msgstr "" + +#. module: account +#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard +msgid "Invoices Created Within Past 15 Days" +msgstr "" + +#. module: account +#: model:ir.model,name:report_account.model_report_invoice_created +msgid "Report of Invoices Created within Last 15 days" +msgstr "" + +#. module: account +#: view:report.invoice.created:0 +msgid "Total Amount" +msgstr "" + +#. module: account +#: view:report.account.receivable:0 +msgid "Accounts by type" +msgstr "" + +#. module: account +#: model:ir.model,name:report_account.model_report_aged_receivable +msgid "Aged Receivable Till Today" +msgstr "" + +#. module: account +#: model:ir.model,name:report_account.model_report_account_receivable +msgid "Receivable accounts" +msgstr "" + +#. module: account +#: field:temp.range,name:0 +msgid "Range" +msgstr "" + +#. module: account +#: model:ir.module.module,description:report_account.module_meta_information +msgid "A module that adds new reports based on the account module." +msgstr "" + +#. module: account +#: model:ir.module.module,shortdesc:report_account.module_meta_information +msgid "Account Reporting - Reporting" +msgstr "" + +#. module: account +#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph +#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph +msgid "Balance by Type of Account" +msgstr "" + +#. module: account +#: field:report.account.receivable,name:0 +msgid "Week of Year" +msgstr "" + +#. module: account +#: field:report.invoice.created,create_date:0 +msgid "Create Date" +msgstr "" + +#. module: account +#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph +#: view:report.aged.receivable:0 +msgid "Aged Receivable" +msgstr "" + +#. module: account +#: view:report.invoice.created:0 +msgid "Untaxed Amount" +msgstr "" diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 920ffbff1bf..3336c6df26f 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:26+0000\n" +"PO-Revision-Date: 2010-08-08 05:53+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -4458,6 +4458,9 @@ msgid "" "to the higher ones. The order is important if you have a tax with several " "tax children. In this case, the evaluation order is important." msgstr "" +"Pole numeracji jest stosowane do ustalania kolejności pozycji podatkowych " +"od najniższej do najwyższej. Kolejność jest istotna, jeśli masz podatki z " +"podatkami podrzędnymi." #. module: account #: view:account.tax:0 diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po index ce9428e8299..4a9ea7c0630 100644 --- a/addons/account/i18n/sq.po +++ b/addons/account/i18n/sq.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: ASTRIT BOKSHI \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:01+0000\n" +"PO-Revision-Date: 2010-08-08 05:46+0000\n" "Last-Translator: bokshas \n" "Language-Team: Albanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po index fcdfacc0eba..298efaf2b2d 100644 --- a/addons/account/i18n/sr.po +++ b/addons/account/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:19+0000\n" -"Last-Translator: Dragan Životić \n" +"PO-Revision-Date: 2010-08-04 13:59+0000\n" +"Last-Translator: Данило Шеган \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:41+0000\n" +"X-Launchpad-Export-Date: 2010-08-05 03:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 8b4e9fef082..e4be84e49c7 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:37+0000\n" +"PO-Revision-Date: 2010-08-08 07:10+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: <> <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 9b5b6372ded..444abc21ce8 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 13:00+0000\n" +"PO-Revision-Date: 2010-08-08 04:58+0000\n" "Last-Translator: Omer Barlas \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 9ff9fca151a..bc155ff97c9 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:10+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2010-08-08 05:43+0000\n" +"Last-Translator: Jeff Wang \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:41+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -35,12 +35,12 @@ msgstr "未支付的采购发票" #. module: account #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Entries Encoding" -msgstr "分录" +msgstr "凭证" #. module: account #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form msgid "Specify The Message for the Overdue Payment Report." -msgstr "" +msgstr "设置过期支付的催款信息" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 @@ -77,7 +77,7 @@ msgstr "这科目将用于当前产品分类的默认进仓" #. module: account #: help:account.invoice,period_id:0 msgid "Keep empty to use the period of the validation(invoice) date." -msgstr "留空使用记账(发票)日期的会计期间" +msgstr "留空使用审核（发票）日期的会计期间" #. module: account #: wizard_view:account.automatic.reconcile,reconcile:0 @@ -87,7 +87,7 @@ msgstr "对账结果" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled msgid "Unreconciled entries" -msgstr "未对账" +msgstr "凭证反核销" #. module: account #: field:account.invoice.tax,base_code_id:0 @@ -134,7 +134,7 @@ msgstr "基础税事务符号" #: model:ir.actions.wizard,name:account.wizard_unreconcile_select #: model:ir.ui.menu,name:account.menu_unreconcile_select msgid "Unreconcile entries" -msgstr "未对账" +msgstr "凭证反核销" #. module: account #: constraint:account.period:0 @@ -149,7 +149,7 @@ msgstr "错误!这会计期间无效 " #: model:ir.actions.act_window,name:account.action_move_line_form #: model:ir.ui.menu,name:account.menu_action_move_line_form msgid "Entries" -msgstr "分录" +msgstr "凭证" #. module: account #: selection:account.move.line,centralisation:0 @@ -159,7 +159,7 @@ msgstr "借方汇总" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm msgid "Confirm draft invoices" -msgstr "记账发票草稿" +msgstr "发票入账" #. module: account #: help:account.payment.term.line,days2:0 @@ -177,7 +177,7 @@ msgstr "贷方合计" #. module: account #: field:account.config.wizard,charts:0 msgid "Charts of Account" -msgstr "科目一览表" +msgstr "科目表" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select @@ -190,12 +190,12 @@ msgstr "选择凭证行" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Entry label" -msgstr "分录标签" +msgstr "凭证名称" #. module: account #: model:ir.model,name:account.model_account_model_line msgid "Account Model Entries" -msgstr "科目模型项" +msgstr "凭证模板" #. module: account #: field:account.tax.code,sum_period:0 @@ -212,17 +212,17 @@ msgstr "计算代码(如果类型=代码)" #: view:account.move:0 #: view:account.move.line:0 msgid "Account Entry Line" -msgstr "凭证明细" +msgstr "凭证行" #. module: account #: wizard_view:account.aged.trial.balance,init:0 msgid "Aged Trial Balance" -msgstr "账龄试算平衡表" +msgstr "账龄分析表" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries msgid "Recurrent Entries" -msgstr "周期性分录" +msgstr "周期性凭证" #. module: account #: field:account.analytic.line,amount:0 @@ -242,12 +242,12 @@ msgstr "金额" #: model:ir.actions.wizard,name:account.wizard_third_party_ledger #: model:ir.ui.menu,name:account.menu_third_party_ledger msgid "Partner Ledger" -msgstr "业务伙伴总帐" +msgstr "业务伙伴余额" #. module: account #: field:product.template,supplier_taxes_id:0 msgid "Supplier Taxes" -msgstr "供应商税" +msgstr "进项税" #. module: account #: view:account.move:0 @@ -257,7 +257,7 @@ msgstr "借方合计" #. module: account #: rml:account.tax.code.entries:0 msgid "Accounting Entries-" -msgstr "分录 -" +msgstr "凭证-" #. module: account #: help:account.journal,view_id:0 @@ -266,7 +266,7 @@ msgid "" "view tell Open ERP which fields should be visible, required or readonly and " "in which order. You can create your own view for a faster encoding in each " "journal." -msgstr "给出业务类型中分录的浏览和写入视图. 这视图告诉系统那个字段可见,必须或只读. 你能为每个业务类型创建自己的视图." +msgstr "给出业务类型中凭证的浏览和写入视图. 这视图告诉系统那个字段可见,必须或只读. 你能为每个业务类型创建自己的视图." #. module: account #: help:account.invoice,date_due:0 @@ -277,7 +277,7 @@ msgid "" "date empty, it means direct payment. The payment term may compute several " "due dates, for example 50% now, 50% in one month." msgstr "" -"如果你使用付款条款, 到期将自动生成会计分录. 如果付款条款和到期日期为空, 则意味着直接付款. 付款条款可以计算出几个到期日, 例如现在先付50%, " +"如果你使用付款条款, 到期将自动生成凭证. 如果付款条款和到期日期为空, 则意味着直接付款. 付款条款可以计算出几个到期日, 例如现在先付50%, " "然后在一个月内支付余下的50%." #. module: account @@ -312,17 +312,17 @@ msgstr "来源" #. module: account #: rml:account.analytic.account.journal:0 msgid "Move Name" -msgstr "" +msgstr "凭证名称" #. module: account #: xsl:account.transfer:0 msgid "Reference" -msgstr "参考" +msgstr "关联单号" #. module: account #: wizard_view:account.subscription.generate,init:0 msgid "Subscription Compute" -msgstr "周期性分录计算" +msgstr "生成周期性凭证" #. module: account #: rml:account.central.journal:0 @@ -375,12 +375,12 @@ msgstr "发票说明" #. module: account #: constraint:account.analytic.account:0 msgid "Error! You can not create recursive analytic accounts." -msgstr "错误! 你不能创建递归的辅助核算项" +msgstr "错误! 你不能创建递归的辅助核算项目" #. module: account #: field:account.bank.statement.reconcile,total_entry:0 msgid "Total entries" -msgstr "分录合计" +msgstr "合计" #. module: account #: field:account.fiscal.position.account,account_src_id:0 @@ -391,23 +391,23 @@ msgstr "源科目" #. module: account #: field:account.journal,update_posted:0 msgid "Allow Cancelling Entries" -msgstr "允许取消分录" +msgstr "允许取消凭证" #. module: account #: model:process.transition,name:account.process_transition_paymentorderbank0 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0 msgid "Payment Reconcilation" -msgstr "付款对账" +msgstr "付款核销" #. module: account #: model:account.journal,name:account.expenses_journal msgid "Journal de frais" -msgstr "费用记录集合" +msgstr "费用业务类型" #. module: account #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal msgid "All Analytic Entries" -msgstr "所有辅助核算分录" +msgstr "所有辅助核算凭证" #. module: account #: rml:account.overdue:0 @@ -422,12 +422,12 @@ msgstr "负数" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "" +msgstr "(业务伙伴/科目)名称" #. module: account #: selection:account.move,type:0 msgid "Contra" -msgstr "反向" +msgstr "冲销" #. module: account #: field:account.analytic.account,state:0 @@ -449,12 +449,12 @@ msgstr "未支付的供应商退款" #: view:account.tax:0 #: view:account.tax.template:0 msgid "Special Computation" -msgstr "特殊计算" +msgstr "特殊算法" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement with/without reconciliation from draft statement" -msgstr "从草稿记账与对/不对帐" +msgstr "银行凭证过账" #. module: account #: wizard_view:account.move.bank.reconcile,init:0 @@ -466,7 +466,7 @@ msgstr "银行对账" #. module: account #: rml:account.invoice:0 msgid "Disc.(%)" -msgstr "" +msgstr "折扣(%)" #. module: account #: rml:account.general.ledger:0 @@ -475,7 +475,7 @@ msgstr "" #: rml:account.overdue:0 #: field:account.subscription,ref:0 msgid "Ref" -msgstr "原始凭证编号" +msgstr "关联单号" #. module: account #: field:account.tax.template,type_tax_use:0 diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 1816f4c31bf..d40d4037c97 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -942,6 +942,9 @@ class account_invoice(osv.osv): number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id}) else: number = self.pool.get('ir.sequence').get(cr, uid, 'account.invoice.' + invtype) + + if not number: + raise osv.except_osv(_('Warning !'), _('There is no active invoice sequence defined for the journal !')) if invtype in ('in_invoice', 'in_refund'): ref = reference diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index 78c7af3b2af..bd52f9be4f5 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -107,7 +107,7 @@ - + @@ -121,7 +121,7 @@ - + Chart of Account diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index e11a0d7b44c..d6c9ab114e5 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -179,7 +179,7 @@ - + @@ -209,7 +209,7 @@ - + [[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] diff --git a/addons/account/report/account_balance_landscape.rml b/addons/account/report/account_balance_landscape.rml index 13a00655d5e..d96227476a5 100644 --- a/addons/account/report/account_balance_landscape.rml +++ b/addons/account/report/account_balance_landscape.rml @@ -125,7 +125,7 @@ - + diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 5ab769d6625..1a5abbdea23 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -80,7 +80,7 @@ - + @@ -168,9 +168,6 @@ - - - @@ -182,7 +179,7 @@ - + Chart of Account Fiscal Year diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index fbb32edc975..8cd7e8bab51 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -96,7 +96,7 @@ - + @@ -154,14 +154,14 @@ - + - + @@ -175,10 +175,19 @@ - + - Balance Sheet + + + + + + + + + + Balance Sheet @@ -190,7 +199,7 @@ [[ get_data(data) or removeParentNode('para') ]] - + Chart of Account Fiscal Year @@ -202,7 +211,7 @@ [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date End Date @@ -212,7 +221,7 @@ [[get_end_date(data) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index f31ae1d50ab..03ae0ed3bc1 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -159,7 +159,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -242,7 +242,7 @@ - + [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index c8f23e7631f..244f9ac8291 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -86,7 +86,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -264,7 +264,7 @@ - [[ display_currency(data)==False or removeParentNode('blockTable') ]] + [[ display_currency(data)==False or removeParentNode('blockTable') ]] Code Journal Name @@ -325,7 +325,7 @@ - [[ display_currency(data)==False or removeParentNode('blockTable') ]] + [[ display_currency(data)==False or removeParentNode('blockTable') ]] [[ o.name ]] : @@ -347,7 +347,7 @@
[[lines(o.id) and removeParentNode('para') or removeParentNode('section') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]] diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index 2a99b643bff..dd5ffa87bd9 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -102,7 +102,7 @@ - + diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index fe090650d40..09781a7b346 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -101,7 +101,7 @@ - + @@ -200,11 +200,7 @@ - - - - - + [[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 75d2fa2070b..400eed846f3 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -3,9 +3,6 @@ @@ -29,7 +26,7 @@ - + @@ -172,7 +169,7 @@ - + @@ -203,7 +200,7 @@ - + [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml index 7ee04a79e2b..df381493889 100644 --- a/addons/account/report/account_partner_balance.rml +++ b/addons/account/report/account_partner_balance.rml @@ -82,7 +82,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -189,7 +189,7 @@ - + Chart of Account Fiscal Year diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index b6e564d26d0..934591032e8 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -41,7 +41,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -176,15 +176,43 @@ Third Party Ledger + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index f29b8937777..7396734fdc9 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -153,7 +153,7 @@ - + @@ -193,6 +193,10 @@ + + + + @@ -304,7 +308,7 @@ - + @@ -320,17 +324,33 @@ - + - + - Third Party Ledger - + + + + Third Party Ledger + + + + - + + + + + + + + + + + Chart of Account diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index 1497a31d486..28215f06075 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -115,7 +115,7 @@ - + @@ -205,11 +205,11 @@ [[ get_data(data) or removeParentNode('para')]] - + Chart of Account Fiscal Year - Filter By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account Printing Date @@ -217,7 +217,7 @@ [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date End Date @@ -227,7 +227,7 @@ [[get_end_date(data) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 284ca7da035..0a5c03ad395 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -117,7 +117,7 @@ - + @@ -207,7 +207,7 @@ - + Chart of Account Fiscal Year diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po index 6dde739244a..5d9ee0f208d 100644 --- a/addons/account_analytic_analysis/i18n/bg.po +++ b/addons/account_analytic_analysis/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:34+0000\n" +"PO-Revision-Date: 2010-08-08 06:04+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po index 847896e10b7..7b9cc587fe3 100644 --- a/addons/account_analytic_analysis/i18n/fi.po +++ b/addons/account_analytic_analysis/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:16+0000\n" +"PO-Revision-Date: 2010-08-08 07:14+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po index 9cf05b7ef35..5c054c84516 100644 --- a/addons/account_analytic_analysis/i18n/lt.po +++ b/addons/account_analytic_analysis/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:51+0000\n" +"PO-Revision-Date: 2010-08-08 06:34+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po index fc20ae4d8df..ec38410ed1e 100644 --- a/addons/account_analytic_analysis/i18n/nl.po +++ b/addons/account_analytic_analysis/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 20:34+0000\n" -"Last-Translator: Jan Verlaan (Veritos) \n" +"PO-Revision-Date: 2010-08-07 10:53+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-08 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po index 7110a926e3a..fd4c27448a6 100644 --- a/addons/account_analytic_analysis/i18n/tr.po +++ b/addons/account_analytic_analysis/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:59+0000\n" +"PO-Revision-Date: 2010-08-08 05:58+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po index f5582f33572..54cc112aad8 100644 --- a/addons/account_analytic_default/i18n/lt.po +++ b/addons/account_analytic_default/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:32+0000\n" +"PO-Revision-Date: 2010-08-08 05:59+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:44+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po index d70fb58e15a..165c10bdc4f 100644 --- a/addons/account_analytic_default/i18n/tr.po +++ b/addons/account_analytic_default/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:59+0000\n" +"PO-Revision-Date: 2010-08-08 05:58+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:44+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po index 94f74929c36..2e8194627d7 100644 --- a/addons/account_analytic_plans/i18n/it.po +++ b/addons/account_analytic_plans/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:28+0000\n" +"PO-Revision-Date: 2010-08-08 06:23+0000\n" "Last-Translator: eLBati - albatos.com \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po index d88ce5a76b6..16b132dc4f8 100644 --- a/addons/account_analytic_plans/i18n/lt.po +++ b/addons/account_analytic_plans/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:30+0000\n" +"PO-Revision-Date: 2010-08-08 05:59+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po index 1e83b58b8e1..e74571e1d8a 100644 --- a/addons/account_analytic_plans/i18n/tr.po +++ b/addons/account_analytic_plans/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:25+0000\n" +"PO-Revision-Date: 2010-08-08 05:52+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po index 5025a0d304a..6d497576f3b 100644 --- a/addons/account_budget/i18n/lt.po +++ b/addons/account_budget/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:08+0000\n" +"PO-Revision-Date: 2010-08-08 06:33+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po index ff99680f246..44b7ab647dc 100644 --- a/addons/account_budget/i18n/tr.po +++ b/addons/account_budget/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:09+0000\n" +"PO-Revision-Date: 2010-08-08 06:33+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po index fb8e1edbad7..d9f2c6e9a37 100644 --- a/addons/account_coda/i18n/ar.po +++ b/addons/account_coda/i18n/ar.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 13:11+0000\n" -"PO-Revision-Date: 2010-08-03 18:45+0000\n" +"PO-Revision-Date: 2010-08-08 07:03+0000\n" "Last-Translator: bamuhrez \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po index 0e482793cd2..e289845cc08 100644 --- a/addons/account_followup/i18n/lt.po +++ b/addons/account_followup/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:26+0000\n" +"PO-Revision-Date: 2010-08-08 05:52+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:39+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po index dc76db8c7a5..37ad561bcfb 100644 --- a/addons/account_followup/i18n/tr.po +++ b/addons/account_followup/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:55+0000\n" +"PO-Revision-Date: 2010-08-08 06:21+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:39+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po index 3eee66dd246..73fda8c7c80 100644 --- a/addons/account_invoice_layout/i18n/lt.po +++ b/addons/account_invoice_layout/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:12+0000\n" +"PO-Revision-Date: 2010-08-08 05:51+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout diff --git a/addons/account_invoice_layout/i18n/nl.po b/addons/account_invoice_layout/i18n/nl.po index f0b601393dc..838f492bc87 100644 --- a/addons/account_invoice_layout/i18n/nl.po +++ b/addons/account_invoice_layout/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 20:36+0000\n" -"Last-Translator: Jan Verlaan (Veritos) \n" +"PO-Revision-Date: 2010-08-07 10:24+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-08 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po index 65c4d0ce5fc..d2834768e3b 100644 --- a/addons/account_invoice_layout/i18n/tr.po +++ b/addons/account_invoice_layout/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:19+0000\n" +"PO-Revision-Date: 2010-08-08 06:27+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po index 591a8edf585..cb29a2fce98 100644 --- a/addons/account_payment/i18n/lt.po +++ b/addons/account_payment/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:08+0000\n" +"PO-Revision-Date: 2010-08-08 07:16+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po index 4fc7dc2ad6f..2fe93d58baf 100644 --- a/addons/account_payment/i18n/tr.po +++ b/addons/account_payment/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:57+0000\n" +"PO-Revision-Date: 2010-08-08 07:21+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:43+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po index 8e472ae2977..6a111176a8f 100644 --- a/addons/account_report/i18n/lt.po +++ b/addons/account_report/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:27+0000\n" +"PO-Revision-Date: 2010-08-08 06:23+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:36+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_report diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po index 4b4865cf10f..e8bdddea599 100644 --- a/addons/account_report/i18n/tr.po +++ b/addons/account_report/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:48+0000\n" +"PO-Revision-Date: 2010-08-08 06:50+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:36+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_report diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po index aaeb2865401..619a54f38a6 100644 --- a/addons/account_reporting/i18n/lt.po +++ b/addons/account_reporting/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:42+0000\n" +"PO-Revision-Date: 2010-08-08 04:54+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:45+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po index 1a8b8dbf303..99cc618acf4 100644 --- a/addons/account_reporting/i18n/tr.po +++ b/addons/account_reporting/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 10:43+0000\n" +"PO-Revision-Date: 2010-08-08 07:01+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:45+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po index 3364af35b69..6dd02522ee1 100644 --- a/addons/account_tax_include/i18n/tr.po +++ b/addons/account_tax_include/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:24+0000\n" +"PO-Revision-Date: 2010-08-08 06:23+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:39+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:42+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_tax_include diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po index 54aebca8c5f..f31981551f2 100644 --- a/addons/account_voucher/i18n/lt.po +++ b/addons/account_voucher/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:18+0000\n" +"PO-Revision-Date: 2010-08-08 06:32+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po index cf44c9b09d6..af589027472 100644 --- a/addons/account_voucher/i18n/nl.po +++ b/addons/account_voucher/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 23:57+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-08-07 11:08+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-08 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po index 4af48f88578..a1bb3bb0435 100644 --- a/addons/account_voucher/i18n/tr.po +++ b/addons/account_voucher/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:23+0000\n" +"PO-Revision-Date: 2010-08-08 06:23+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po index dcef9d39063..d94a79a5bf0 100644 --- a/addons/analytic_journal_billing_rate/i18n/tr.po +++ b/addons/analytic_journal_billing_rate/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:01+0000\n" +"PO-Revision-Date: 2010-08-08 08:09+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po index 27717377365..9c268f883c1 100644 --- a/addons/analytic_user_function/i18n/tr.po +++ b/addons/analytic_user_function/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 12:17+0000\n" +"PO-Revision-Date: 2010-08-08 06:01+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-04 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-09 03:44+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py index 7d96fe90aa1..75b50113028 100644 --- a/addons/auction/__openerp__.py +++ b/addons/auction/__openerp__.py @@ -40,34 +40,31 @@ """, 'author': 'OpenERP SA', 'depends': ['base', 'account', 'hr_attendance'], - 'init_xml': ['auction_sequence.xml'], + 'init_xml': ['auction_sequence.xml', 'auction_data.xml'], 'update_xml': [ 'security/ir.model.access.csv', -# 'wizard/auction_lots_cancel_view.xml', -# 'wizard/auction_transfer_unsold_object_view.xml', - 'wizard/auction_lots_able_view.xml', - 'wizard/auction_lots_enable_view.xml', + # 'wizard/auction_lots_able_view.xml', + # 'wizard/auction_lots_enable_view.xml', 'wizard/auction_lots_make_invoice_buyer_view.xml', 'wizard/auction_lots_make_invoice_view.xml', 'wizard/auction_taken_view.xml', 'wizard/auction_lots_auction_move_view.xml', 'wizard/auction_pay_buy_view.xml', - 'wizard/auction_payer_sel_view.xml', + #'wizard/auction_payer_sel_view.xml', 'wizard/auction_lots_sms_send_view.xml', 'wizard/auction_catalog_flagey_view.xml', -# 'wizard/auction_aie_send_view.xml', -# 'wizard/auction_aie_send_result_view.xml', 'wizard/auction_lots_buyer_map_view.xml', -# 'wizard/auction_lots_numerotate_view.xml', - 'auction_view.xml', 'auction_report.xml', + 'report/report_auction_view.xml', 'auction_wizard.xml', 'board_auction_view.xml', - 'board_auction_manager_view.xml', + # 'board_auction_manager_view.xml', ], 'demo_xml': ['auction_demo.xml','board_auction_demo.xml'], + 'test': ['test/auction.yml'], + 'installable': True, 'active': False, 'certificate': '0039333102717', diff --git a/addons/auction/auction.py b/addons/auction/auction.py index e55d999a1d1..f6aebbb5077 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -18,24 +18,27 @@ # along with this program. If not, see . # ############################################################################## - -import time -import netsvc -from osv import fields, osv, orm -import ir from mx import DateTime +from osv import fields, osv, orm +from tools import config from tools.translate import _ +import ir +import netsvc +import os +import time +import tools #---------------------------------------------------------- # Auction Artists #---------------------------------------------------------- + class auction_artists(osv.osv): _name = "auction.artists" _columns = { - 'name': fields.char('Artist/Author Name', size=64, required=True), - 'pseudo': fields.char('Pseudo', size=64), - 'birth_death_dates':fields.char('Birth / Death dates', size=64), - 'biography': fields.text('Biography'), + 'name': fields.char('Artist/Author Name', size=64, required=True), + 'pseudo': fields.char('Pseudo', size=64), + 'birth_death_dates':fields.char('Birth / Death dates', size=64), + 'biography': fields.text('Biography'), } auction_artists() @@ -43,49 +46,55 @@ auction_artists() # Auction Dates #---------------------------------------------------------- class auction_dates(osv.osv): + """Auction Dates""" _name = "auction.dates" - + _description=__doc__ + def _adjudication_get(self, cr, uid, ids, prop, unknow_none, unknow_dict): - tmp={} - for id in ids: - tmp[id]=0.0 - cr.execute("select sum(obj_price) from auction_lots where auction_id=%s", (id,)) - sum = cr.fetchone() - if sum: - tmp[id]=sum[0] - return tmp + res={} + total = 0.0 + lots_obj = self.pool.get('auction.lots') + for auction in self.browse(cr, uid, ids): + lots_ids = lots_obj.search(cr, uid, [('auction_id', '=', auction.id)]) + for lots in lots_obj.browse(cr, uid, lots_ids): + total+=lots.obj_price or 0.0 + res[auction.id]=total + return res - def name_get(self, cr, uid, ids, context={}): - if not len(ids): + def name_get(self, cr, uid, ids, context=None): + if not context: + context={} + if not ids: return [] reads = self.read(cr, uid, ids, ['name', 'auction1'], context) - name = [(r['id'],'['+r['auction1']+'] '+ r['name']) for r in reads] + name = [(r['id'], '['+r['auction1']+'] '+ r['name']) for r in reads] return name _columns = { - 'name': fields.char('Auction Name', size=64, required=True), - 'expo1': fields.date('First Exposition Day', required=True), - 'expo2': fields.date('Last Exposition Day', required=True), - 'auction1': fields.date('First Auction Day', required=True), - 'auction2': fields.date('Last Auction Day', required=True), - 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True), - 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True), - 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs'), - 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs'), - 'acc_income': fields.many2one('account.account', 'Income Account', required=True), - 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), - 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True), - 'state': fields.selection((('draft','Draft'),('closed','Closed')),'State',select=1, readonly=True, - help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'), - 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), - + 'name': fields.char('Auction Name', size=64, required=True), + 'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"), + 'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"), + 'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"), + 'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"), + 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"), + 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"), + 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"), + 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"), + 'acc_income': fields.many2one('account.account', 'Income Account', required=True), + 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), + 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True), + 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True, + help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'), + 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), } + _defaults = { - 'state': lambda *a: 'draft', + 'state': lambda *a: 'draft', } + _order = "auction1 desc" - def close(self, cr, uid, ids, *args): + def close(self, cr, uid, ids, context=None): """ Close an auction date. @@ -94,410 +103,335 @@ class auction_dates(osv.osv): RETURN: True """ - # objects vendus mais non factures - #TODO: convert this query to tiny API + if not context: + context={} lots_obj = self.pool.get('auction.lots') - cr.execute('select count(*) as c from auction_lots where auction_id IN %s and state=%s and obj_price>0', (tuple(ids),'draft',)) - cr.execute('SELECT COUNT(*) AS c ' - 'FROM auction_lots ' - 'WHERE auction_id IN %s ' - 'AND state=%s AND obj_price>0', (tuple(ids), 'draft')) - nbr = cr.fetchone()[0] - ach_uids = {} - cr.execute('SELECT id FROM auction_lots ' - 'WHERE auction_id IN %s ' - 'AND state=%s AND obj_price>0', (tuple(ids), 'draft')) - r = lots_obj.lots_invoice(cr, uid, [x[0] for x in cr.fetchall()],{},None) - cr.execute('select id from auction_lots where auction_id IN %s and obj_price>0',(tuple(ids),)) - ids2 = [x[0] for x in cr.fetchall()] - # for auction in auction_ids: - c = lots_obj.seller_trans_create(cr, uid, ids2, {}) - self.write(cr, uid, ids, {'state':'closed'}) #close the auction + lots_ids = lots_obj.search(cr, uid, [('auction_id', 'in', ids), ('state', '=', 'draft'), ('obj_price', '>', 0)]) + new_buyer_invoice = lots_obj.lots_invoice(cr, uid, lots_ids, {}, None) + lots_ids2 = lots_obj.search(cr, uid, [('auction_id', 'in', ids), ('obj_price', '>', 0)]) + new_seller_invoice = lots_obj.seller_trans_create(cr, uid, lots_ids2, {}) + self.write(cr, uid, ids, {'state': 'closed'}) #close the auction return True + auction_dates() - #---------------------------------------------------------- # Deposits #---------------------------------------------------------- -def _inv_uniq(cr, ids): - cr.execute('SELECT id FROM auction_lots ' - 'WHERE auction_id IN %s ' - 'AND obj_price>0', (tuple(ids),)) - for datas in cr.fetchall(): - cr.execute('select count(*) from auction_deposit where name=%s', (datas[0],)) - if cr.fetchone()[0]>1: - return False - return True - class auction_deposit(osv.osv): + """Auction Deposit Border""" + _name = "auction.deposit" - _description="Deposit Border" + _description=__doc__ _order = "id desc" _columns = { - 'transfer' : fields.boolean('Transfer'), - 'name': fields.char('Depositer Inventory', size=64, required=True), - 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True), - 'date_dep': fields.date('Deposit date', required=True), - 'method': fields.selection((('keep','Keep until sold'),('decease','Decrease limit of 10%'),('contact','Contact the Seller')), 'Withdrawned method', required=True), - 'tax_id': fields.many2one('account.tax', 'Expenses'), - 'create_uid': fields.many2one('res.users', 'Created by', readonly=True), - 'info': fields.char('Description', size=64), - 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'), - 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'), - 'total_neg': fields.boolean('Allow Negative Amount'), + 'transfer' : fields.boolean('Transfer'), + 'name': fields.char('Depositer Inventory', size=64, required=True), + 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True), + 'date_dep': fields.date('Deposit date', required=True), + 'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True), + 'tax_id': fields.many2one('account.tax', 'Expenses'), + 'create_uid': fields.many2one('res.users', 'Created by', readonly=True), + 'info': fields.char('Description', size=64), + 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'), + 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'), + 'total_neg': fields.boolean('Allow Negative Amount'), } _defaults = { -# 'date_dep': lambda *a: time.strftime('%Y-%m-%d'), - 'method': lambda *a: 'keep', - 'total_neg': lambda *a: False, - 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'), + 'method': lambda *a: 'keep', + 'total_neg': lambda *a: False, + 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'), } - _constraints = [ - ] - def partner_id_change(self, cr, uid, ids, part): - return {} + auction_deposit() #---------------------------------------------------------- # (Specific) Deposit Costs #---------------------------------------------------------- class auction_deposit_cost(osv.osv): + + """Auction Deposit Cost""" + _name = 'auction.deposit.cost' + _description=__doc__ _columns = { - 'name': fields.char('Cost Name', required=True, size=64), - 'amount': fields.float('Amount'), - 'account': fields.many2one('account.account', 'Destination Account', required=True), - 'deposit_id': fields.many2one('auction.deposit', 'Deposit'), + 'name': fields.char('Cost Name', required=True, size=64), + 'amount': fields.float('Amount'), + 'account': fields.many2one('account.account', 'Destination Account', required=True), + 'deposit_id': fields.many2one('auction.deposit', 'Deposit'), } auction_deposit_cost() #---------------------------------------------------------- # Lots Categories #---------------------------------------------------------- +class aie_category(osv.osv): + + _name="aie.category" + _order = "name" + _columns={ + 'name': fields.char('Name', size=64, required=True), + 'code':fields.char('Code', size=64), + 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'), + 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category") + } + + def name_get(self, cr, uid, ids, context=None): + if not context: + context = {} + res = [] + if not ids: + return res + reads = self.read(cr, uid, ids, ['name', 'parent_id'], context) + for record in reads: + name = record['name'] + if record['parent_id']: + name = record['parent_id'][1] + ' / ' + name + res.append((record['id'], name)) + return res + +aie_category() + class auction_lot_category(osv.osv): + """Auction Lots Category""" + _name = 'auction.lot.category' + _description=__doc__ _columns = { - 'name': fields.char('Category Name', required=True, size=64), - 'priority': fields.float('Priority'), - 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."), - 'aie_categ' : fields.selection([('41',"Unclassifieds"), - ('2',"Antiques"), - ('42',"Antique/African Arts"), - ('59',"Antique/Argenterie"), - ('45',"Antique/Art from the Ivory Coast"), - ('46',"Antique/Art from the Ivory Coast/African Arts"), - ('12',"Antique/Books, manuscripts, eso."), - ('11',"Antique/Carpet and textilles"), - ('14',"Antique/Cartoons"), - ('26',"Antique/Clocks and watches"), - ('31',"Antique/Collectible & art objects"), - ('33',"Antique/Engravings"), - ('10',"Antique/Furnitures"), - ('50',"Antique/Graphic Arts"), - ('37',"Antique/Jewelry"), - ('9',"Antique/Lightings"), - ('52',"Antique/Metal Ware"), - ('51',"Antique/Miniatures / Collections"), - ('53',"Antique/Musical Instruments"), - ('19',"Antique/Old weapons and militaria"), - ('43',"Antique/Oriental Arts"), - ('47',"Antique/Oriental Arts/Chineese furnitures"), - ('24',"Antique/Others"), - ('8',"Antique/Painting"), - ('25',"Antique/Porcelain, Ceramics, Glassmaking, ..."), - ('13',"Antique/Posters"), - ('56',"Antique/Religiosa"), - ('54',"Antique/Scientific Instruments"), - ('18',"Antique/Sculpture, bronze, eso."), - ('55',"Antique/Tin / Copper wares"), - ('16',"Antique/Toys"), - ('57',"Antique/Verreries"), - ('17',"Antique/Wine"), - ('1',"Contemporary Art"), - ('58',"Cont. Art/Arts"), - ('27',"Cont. Art/Curiosa"), - ('15',"Cont. Art/Jewelry"), - ('30',"Cont. Art/Other Media"), - ('3',"Cont. Art/Photo"), - ('4',"Cont. Art/Painting"), - ('5',"Cont. Art/Sculpture"), - ('48',"Cont. Art/Shows")], - 'Aie Category'), + 'name': fields.char('Category Name', required=True, size=64), + 'priority': fields.float('Priority'), + 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."), + 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'), } _defaults = { - 'active' : lambda *a: 1, - 'aie_categ' : lambda *a:1, + 'active' : lambda *a: 1, } auction_lot_category() -def _type_get(self, cr, uid,ids): - cr.execute('select name, name from auction_lot_category order by name') - return cr.fetchall() - #---------------------------------------------------------- # Lots #---------------------------------------------------------- -def _inv_constraint(cr, ids): - cr.execute('SELECT id, bord_vnd_id, lot_num FROM auction_lots ' - 'WHERE id IN %s', - (tuple(ids),)) - for datas in cr.fetchall(): - cr.execute('select count(*) from auction_lots where bord_vnd_id=%s and lot_num=%s', (datas[1],datas[2])) - if cr.fetchone()[0]>1: - return False - return True +def _type_get(self, cr, uid, context=None): + if not context: + context = {} + obj = self.pool.get('auction.lot.category') + ids = obj.search(cr, uid, []) + res = obj.read(cr, uid, ids, ['name'], context) + res = [(r['name'], r['name']) for r in res] + return res class auction_lots(osv.osv): + + """Auction Object""" _name = "auction.lots" _order = "obj_num,lot_num,id" - _description="Object" + _description=__doc__ - def button_not_bought(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'unsold'}) - def button_taken_away(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'taken_away'}) + def button_not_bought(self, cr, uid, ids, context=None): + if not context: + context={} + return self.write(cr, uid, ids, {'state':'unsold'}) + + def button_taken_away(self, cr, uid, ids, context=None): + if not context: + context={} + return self.write(cr, uid, ids, {'state':'taken_away', 'ach_emp': True}) - def button_unpaid(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'draft'}) + def button_unpaid(self, cr, uid, ids, context=None): + if not context: + context={} + return self.write(cr, uid, ids, {'state':'draft'}) - def button_draft(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'draft'}) + def button_bought(self, cr, uid, ids, context=None): + if not context: + context={} + return self.write(cr, uid, ids, {'state':'sold'}) - def button_bought(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'sold'}) - - def _buyerprice(self, cr, uid, ids, name, args, context): - res={} - lots=self.pool.get('auction.lots').browse(cr,uid,ids) - pt_tax=self.pool.get('account.tax') + def _getprice(self, cr, uid, ids, fields, args, context=None): + """This Function compute amount total with tax for buyer and seller. + @param ids: List of auction lots's id + @param name: List of function fields. + @param context: A standard dictionary for contextual values + @return: Dictionary of function fields value. + """ + if not context: + context = {} + + res = {} + account_analytic_line_obj = self.pool.get('account.analytic.line') + lots = self.browse(cr, uid, ids, context) + pt_tax = self.pool.get('account.tax') for lot in lots: - amount_total=0.0 - # if ((lot.obj_price==0) and (lot.state=='draft')): - # montant=lot.lot_est1 - # else: - montant=lot.obj_price or 0.0 - taxes = [] - if lot.author_right: - taxes.append(lot.author_right) - if lot.auction_id: - taxes += lot.auction_id.buyer_costs - tax=pt_tax.compute(cr,uid,taxes,montant,1) - for t in tax: - amount_total+=t['amount'] - amount_total += montant - res[lot.id] = amount_total - return res - - - def _sellerprice(self, cr, uid, ids,*a): - res={} - lots=self.pool.get('auction.lots').browse(cr,uid,ids) - pt_tax=self.pool.get('account.tax') - for lot in lots: - amount_total=0.0 - # if ((lot.obj_price==0) and (lot.state=='draft')): - # montant=lot.lot_est1 - # else: - montant=lot.obj_price - taxes = [] - if lot.bord_vnd_id.tax_id: - taxes.append(lot.bord_vnd_id.tax_id) - elif lot.auction_id and lot.auction_id.seller_costs: - taxes += lot.auction_id.seller_costs - tax=pt_tax.compute(cr,uid,taxes,montant,1) - for t in tax: - amount_total+=t['amount'] - res[lot.id] = montant+amount_total - return res - - def _grossprice(self, cr, uid, ids, name, args, context): - """gross revenue""" - res={} - auction_lots_obj = self.read(cr,uid,ids,['seller_price','buyer_price','auction_id']) - for auction_data in auction_lots_obj: total_tax = 0.0 - if auction_data['auction_id']: - total_tax += auction_data['buyer_price']-auction_data['seller_price'] - res[auction_data['id']] = total_tax + taxes = [] + for name in fields: + res[lot.id] = {name: False} + amount = lot.obj_price or 0.0 + result = 0.0 + if name == "buyer_price": + if lot.author_right: + taxes.append(lot.author_right) + if lot.auction_id: + taxes += lot.auction_id.buyer_costs + tax = pt_tax.compute_all(cr, uid, taxes, amount, 1)['taxes'] + for t in tax: + result += t['amount'] + result += amount + elif name == "seller_price": + if lot.bord_vnd_id.tax_id: + taxes.append(lot.bord_vnd_id.tax_id) + elif lot.auction_id and lot.auction_id.seller_costs: + taxes += lot.auction_id.seller_costs + tax = pt_tax.compute_all(cr, uid, taxes, amount, 1)['taxes'] + for t in tax: + result += t['amount'] + result += amount + elif name == "gross_revenue": + if lot.auction_id: + result = lot.buyer_price - lot.seller_price + + elif name == "net_revenue": + if lot.auction_id: + result = lot.buyer_price - lot.seller_price - lot.costs + + elif name == "gross_margin": + if ((lot.obj_price==0) and (lot.state=='draft')): + amount = lot.lot_est1 + else: + amount = lot.obj_price + if amount > 0: + result = (lot.gross_revenue * 100) / amount + result = round(result,2) + + elif name == "net_margin": + if ((lot.obj_price==0) and (lot.state=='draft')): + amount = lot.lot_est1 + else: + amount = lot.obj_price + if amount > 0: + result = (lot.net_revenue * 100) / amount + result = round(result,2) + elif name == "costs": + # costs: Total credit of analytic account + # objects sold during this auction (excluding analytic lines that are in the analytic journal of the auction date) + #TOCHECK: Calculation OF Indirect Cost + som = 0.0 + if lot.auction_id: + auct_id = lot.auction_id.id + lot_count = self.search(cr, uid, [('auction_id', '=', auct_id)], count=True) + line_ids = account_analytic_line_obj.search(cr, uid, [ + ('account_id', '=', lot.auction_id.account_analytic_id.id), + ('journal_id', '<>', lot.auction_id.journal_id.id), + ('journal_id', '<>', lot.auction_id.journal_seller_id.id)]) + indir_cost = lot.bord_vnd_id.specific_cost_ids + for r in lot.bord_vnd_id.specific_cost_ids: + som += r.amount + for line in account_analytic_line_obj.browse(cr, uid, line_ids, context=context): + if line.amount: + som -= line.amount + result = som/lot_count + + elif name=="paid_ach": + result = False + if lot.ach_inv_id and lot.ach_inv_id.state == 'paid': + result = True + + elif name=="paid_vnd": + result = False + if lot.sel_inv_id and lot.sel_inv_id.state == 'paid': + result = True + + res[lot.id][name] = result + + return res - - def _grossmargin(self, cr, uid, ids, name, args, context): - """ - gross Margin : Gross revenue * 100 / Adjudication - (state==unsold or obj_ret_price>0): adj_price = 0 (=> gross margin = 0, net margin is negative) - """ - res={} - for lot in self.browse(cr, uid, ids, context): - if ((lot.obj_price==0) and (lot.state=='draft')): - montant=lot.lot_est1 - else: - montant=lot.obj_price - if lot.obj_price>0: - total=(lot.gross_revenue*100.0) /lot.obj_price - else: - total = 0.0 - res[lot.id]=round(total,2) - return res - - def onchange_obj_ret(self, cr, uid, ids, obj_ret, *args): + def onchange_obj_ret(self, cr, uid, ids, obj_ret, context=None): + if not context: + context={} if obj_ret: return {'value': {'obj_price': 0}} return {} - def _costs(self,cr,uid,ids,context,*a): - """ - costs: Total credit of analytic account - / # objects sold during this auction - (excluding analytic lines that are in the analytic journal of the auction date). - """ - res={} - for lot in self.browse(cr,uid,ids): - som=0.0 - if not lot.auction_id: - res[lot.id] = 0.0 - continue - auct_id=lot.auction_id.id - cr.execute('select count(*) from auction_lots where auction_id=%s', (auct_id,)) - nb = cr.fetchone()[0] - account_analytic_line_obj = self.pool.get('account.analytic.line') - line_ids = account_analytic_line_obj.search(cr, uid, [('account_id', '=', lot.auction_id.account_analytic_id.id),('journal_id', '<>', lot.auction_id.journal_id.id),('journal_id', '<>', lot.auction_id.journal_seller_id.id)]) - #indir_cost=lot.bord_vnd_id.specific_cost_ids - #for r in lot.bord_vnd_id.specific_cost_ids: - # som+=r.amount - - for line in account_analytic_line_obj.browse(cr,uid,line_ids): - if line.amount: - som-=line.amount - res[lot.id]=som/nb - return res - - def _netprice(self, cr, uid, ids, name, args, context): - """This is the net revenue""" - res={} - auction_lots_obj = self.read(cr,uid,ids,['seller_price','buyer_price','auction_id','costs']) - for auction_data in auction_lots_obj: - total_tax = 0.0 - if auction_data['auction_id']: - total_tax += auction_data['buyer_price']-auction_data['seller_price']-auction_data['costs'] - res[auction_data['id']] = total_tax - return res - - def _netmargin(self, cr, uid, ids, name, args, context): - res={} - total_tax = 0.0 - total=0.0 - montant=0.0 - auction_lots_obj = self.read(cr,uid,ids,['net_revenue','auction_id','lot_est1','obj_price','state']) - for auction_data in auction_lots_obj: - if ((auction_data ['obj_price']==0) and (auction_data['state']=='draft')): - montant=auction_data['lot_est1'] - else: montant=auction_data ['obj_price'] - if montant>0: - total_tax += (auction_data['net_revenue']*100)/montant - else: - total_tax=0 - res[auction_data['id']] = total_tax - return res - - def _is_paid_vnd(self,cr,uid,ids,*a): - res = {} - lots=self.browse(cr,uid,ids) - for lot in lots: - res[lot.id] = False - if lot.sel_inv_id: - if lot.sel_inv_id.state == 'paid': - res[lot.id] = True - return res - def _is_paid_ach(self,cr,uid,ids,*a): - res = {} - lots=self.browse(cr,uid,ids) - for lot in lots: - res[lot.id] = False - if lot.ach_inv_id: - if lot.ach_inv_id.state == 'paid': - res[lot.id] = True - return res _columns = { - 'bid_lines':fields.one2many('auction.bid_line','lot_id', 'Bids'), - 'auction_id': fields.many2one('auction.dates', 'Auction Date', select=1), - 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True), - 'name': fields.char('Short Description',size=64, required=True), - 'name2': fields.char('Short Description (2)',size=64), - 'lot_type': fields.selection(_type_get, 'Object category', size=64), - 'author_right': fields.many2one('account.tax', 'Author rights'), - 'lot_est1': fields.float('Minimum Estimation'), - 'lot_est2': fields.float('Maximum Estimation'), - 'lot_num': fields.integer('List Number', required=True, select=1 ), - 'create_uid': fields.many2one('res.users', 'Created by', readonly=True), - 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'), - 'lot_local':fields.char('Location',size=64), - 'artist_id':fields.many2one('auction.artists', 'Artist/Author'), - 'artist2_id':fields.many2one('auction.artists', 'Artist/Author 2'), - 'important':fields.boolean('To be Emphatized'), - 'product_id':fields.many2one('product.product', 'Product', required=True), - 'obj_desc': fields.text('Object Description'), - 'obj_num': fields.integer('Catalog Number'), - 'obj_ret': fields.float('Price retired'), - 'obj_comm': fields.boolean('Commission'), - 'obj_price': fields.float('Adjudication price'), - 'ach_avance': fields.float('Buyer Advance'), - 'ach_login': fields.char('Buyer Username',size=64), + 'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'), + 'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction For Object"), + 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide Deposit Information: seller, Withdrawned Method, Object, Deposit Costs"), + 'name': fields.char('Title', size=64, required=True, help='Auction Object Name'), + 'name2': fields.char('Short Description (2)', size=64), + 'lot_type': fields.selection(_type_get, 'Object category', size=64), + 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"), + 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"), + 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"), + 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number In Depositer Inventory"), + 'create_uid': fields.many2one('res.users', 'Created by', readonly=True), + 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'), + 'lot_local':fields.char('Location', size=64, help="Auction Location"), + 'artist_id':fields.many2one('auction.artists', 'Artist/Author'), + 'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'), + 'important':fields.boolean('To be Emphatized'), + 'product_id':fields.many2one('product.product', 'Product', required=True), + 'obj_desc': fields.text('Object Description'), + 'obj_num': fields.integer('Catalog Number'), + 'obj_ret': fields.float('Price retired', help="Object Ret"), + 'obj_comm': fields.boolean('Commission'), + 'obj_price': fields.float('Adjudication price', help="Object Price"), + 'ach_avance': fields.float('Buyer Advance'), + 'ach_login': fields.char('Buyer Username', size=64), 'ach_uid': fields.many2one('res.partner', 'Buyer'), - 'ach_emp': fields.boolean('Taken Away'), - 'is_ok': fields.boolean('Buyer\'s payment'), - 'ach_inv_id': fields.many2one('account.invoice','Buyer Invoice', readonly=True, states={'draft':[('readonly',False)]}), - 'sel_inv_id': fields.many2one('account.invoice','Seller Invoice', readonly=True, states={'draft':[('readonly',False)]}), - 'vnd_lim': fields.float('Seller limit'), - 'vnd_lim_net': fields.boolean('Net limit ?',readonly=True), - 'image': fields.binary('Image'), -# 'paid_vnd':fields.function(_is_paid_vnd,string='Seller Paid',method=True,type='boolean',store=True), - 'paid_vnd':fields.boolean('Seller Paid'), - 'paid_ach':fields.function(_is_paid_ach,string='Buyer invoice reconciled',method=True, type='boolean',store=True), + 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True), + 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, This field is Marked as True"), + 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Bank statement', This field is Marked"), + 'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}), + 'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}), + 'vnd_lim': fields.float('Seller limit'), + 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True), + 'image': fields.binary('Image', help="Object Image"), + 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."), + 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."), 'state': fields.selection(( - ('draft','Draft'), - ('unsold','Unsold'), - ('paid','Paid'), - ('sold','Sold'), - ('taken_away','Taken away')),'State', required=True, readonly=True, + ('draft', 'Draft'), + ('unsold', 'Unsold'), + ('paid', 'Paid'), + ('sold', 'Sold'), + ('taken_away', 'Taken away')), 'State', required=True, readonly=True, help=' * The \'Draft\' state is used when a object is encoding as a new object. \ \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \ \n* The \'Paid\' state is used when user pay for the object \ - \n* The \'Sold\' state is used when user buy the object.'), - 'buyer_price': fields.function(_buyerprice, method=True, string='Buyer price',store=True), - 'seller_price': fields.function(_sellerprice, method=True, string='Seller price',store=True), - 'gross_revenue':fields.function(_grossprice, method=True, string='Gross revenue',store=True), - 'gross_margin':fields.function(_grossmargin, method=True, string='Gross Margin (%)',store=True), - 'costs':fields.function(_costs,method=True,string='Indirect costs',store=True), - 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel','auction_id', 'statement','Payment'), - 'net_revenue':fields.function(_netprice, method=True, string='Net revenue',store=True), - 'net_margin':fields.function(_netmargin, method=True, string='Net Margin (%)',store=True), + \n* The \'Sold\' state is used when user buy the object.'), + 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"), + 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"), + 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"), + 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"), + 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"), + 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement Line For Given Buyer"), + 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"), + 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"), } _defaults = { - 'state':lambda *a: 'draft', - 'lot_num':lambda *a:1, - 'is_ok': lambda *a: False + 'state':lambda *a: 'draft', + 'lot_num':lambda *a:1, + 'is_ok': lambda *a: False, } - _constraints = [ -# (_inv_constraint, 'Twice the same inventory number !', ['lot_num','bord_vnd_id']) - ] - - - def name_get(self, cr, user, ids, context={}): - if not len(ids): + + def name_get(self, cr, user, ids, context=None): + if not context: + context={} + if not ids: return [] - result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])] + result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name', 'obj_num'])] return result - def name_search(self, cr, user, name, args=None, operator='ilike', context={}): - if not len(args): + def name_search(self, cr, user, name, args=None, operator='ilike', context=None): + if not context: + context={} + if not args: args = [] ids = [] if name: - ids = self.search(cr, user, [('obj_num','=',int(name))] + args) + ids = self.search(cr, user, [('obj_num', '=', int(name))] + args) if not ids: - ids = self.search(cr, user, [('name',operator,name)] + args) + ids = self.search(cr, user, [('name', operator, name)] + args) return self.name_get(cr, user, ids) def _sum_taxes_by_type_and_id(self, taxes): @@ -518,7 +452,7 @@ class auction_lots(osv.osv): def compute_buyer_costs(self, cr, uid, ids): amount_total = {} lots = self.browse(cr, uid, ids) -##CHECKME: est-ce que ca vaudrait la peine de faire des groupes de lots qui ont les memes couts pour passer des listes de lots a compute? + ##CHECKME: Is that AC would be worthwhile to make groups of lots that have the same costs to spend a lot of lists compute? taxes = [] amount=0.0 pt_tax = self.pool.get('account.tax') @@ -528,39 +462,27 @@ class auction_lots(osv.osv): taxes.append(lot.author_right) elif lot.auction_id: taxes += lot.auction_id.buyer_costs - tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1) + tax=pt_tax.compute_all(cr, uid, taxes, lot.obj_price, 1)['taxes'] for t in tax: amount+=t['amount'] - #amount+=lot.obj_price*0.2 - #amount+=lot.obj_price amount_total['value']= amount amount_total['amount']= amount + return amount_total - -# for t in taxes_res: -# t.update({'type': 0}) -# return self._sum_taxes_by_type_and_id(taxes_res) - -# lots=self.browse(cr,uid,ids) -# amount=0.0 -# for lot in lots: -# taxes=lot.product_id.taxe_id - - def _compute_lot_seller_costs(self, cr, uid, lot, manual_only=False): costs = [] tax_cost_ids=[] -# tax_cost_ids = [i.id for i in lot.auction_id.seller_costs] - # if there is a specific deposit cost for this depositer, add it + border_id = lot.bord_vnd_id if border_id: if border_id.tax_id: tax_cost_ids.append(border_id.tax_id) elif lot.auction_id and lot.auction_id.seller_costs: tax_cost_ids += lot.auction_id.seller_costs - tax_costs = self.pool.get('account.tax').compute(cr, uid, tax_cost_ids, lot.obj_price, 1) + + tax_costs = self.pool.get('account.tax').compute_all(cr, uid, tax_cost_ids, lot.obj_price, 1)['taxes'] # delete useless keys from the costs computed by the tax object... this is useless but cleaner... for cost in tax_costs: del cost['account_paid_id'] @@ -572,16 +494,16 @@ class auction_lots(osv.osv): c.update({'type': 0}) ###### if lot.vnd_lim_net<0 and lot.obj_price>0: -#FIXME: la string 'remise lot' devrait passer par le systeme de traductions + #FIXME:the string passes have lot 'should go through the system translations. obj_price_wh_costs = reduce(lambda x, y: x + y['amount'], tax_costs, lot.obj_price) if obj_price_wh_costs < lot.vnd_lim: - costs.append({ 'type': 1, - 'id': lot.obj_num, - 'name': 'Remise lot '+ str(lot.obj_num), + costs.append({ 'type': 1, + 'id': lot.obj_num, + 'name': 'Remise lot '+ str(lot.obj_num), 'amount': lot.vnd_lim - obj_price_wh_costs} - #'account_id': lot.auction_id.acc_refund.id ) return costs + def compute_seller_costs(self, cr, uid, ids, manual_only=False): lots = self.browse(cr, uid, ids) costs = [] @@ -613,27 +535,30 @@ class auction_lots(osv.osv): total_cost += c['amount'] costs.extend(bord_costs) if (total_adj+total_cost)<0: -#FIXME: translate tax name + #FIXME: translate tax name new_id = bord and bord.id or 0 - c = {'type':3, 'id':new_id, 'amount':-total_cost-total_adj, 'name':'Ristourne'}#, 'account_id':lots[0].auction_id.acc_refund.id} + c = {'type':3, 'id':new_id, 'amount':-total_cost-total_adj, 'name':'Ristourne'} costs.append(c) return self._sum_taxes_by_type_and_id(costs) # sum remise limite net and ristourne def compute_seller_costs_summed(self, cr, uid, ids): #ach_pay_id + + """This Fuction sum Net remittance limit and refund""" + taxes = self.compute_seller_costs(cr, uid, ids) taxes_summed = {} for tax in taxes: if tax['type'] == 1: tax['id'] = 0 - #FIXME: translate tax names - tax['name'] = 'Remise limite nette' + #FIXME: translate tax names + tax['name'] = 'Discount sharp boundary' elif tax['type'] == 2: tax['id'] = 0 - tax['name'] = 'Frais divers' + tax['name'] = 'Miscellaneous expenditure' elif tax['type'] == 3: tax['id'] = 0 - tax['name'] = 'Rist.' + tax['name'] = 'Cross.' key = (tax['type'], tax['id']) if key in taxes_summed: taxes_summed[key]['amount'] += tax['amount'] @@ -641,14 +566,16 @@ class auction_lots(osv.osv): taxes_summed[key] = tax return taxes_summed.values() - def buyer_proforma(self,cr,uid,ids,context): + def buyer_proforma(self, cr, uid, ids, context=None): + + if not context: + context={} invoices = {} inv_ref = self.pool.get('account.invoice') - partner_r = self.pool.get('res.partner') + res_obj = self.pool.get('res.partner') inv_line_obj = self.pool.get('account.invoice.line') wf_service = netsvc.LocalService('workflow') -# acc_receiv=self.pool.get('account.account').search([cr,uid,[('code','=','4010')]]) - for lot in self.browse(cr,uid,ids,context): + for lot in self.browse(cr, uid, ids, context): if not lot.obj_price>0: continue if not lot.ach_uid.id: @@ -656,23 +583,23 @@ class auction_lots(osv.osv): else: partner_ref =lot.ach_uid.id lot_name = lot.obj_num - res = partner_r.address_get(cr, uid, [partner_ref], ['contact', 'invoice']) + res = res_obj.address_get(cr, uid, [partner_ref], ['contact', 'invoice']) contact_addr_id = res['contact'] invoice_addr_id = res['invoice'] if not invoice_addr_id: raise orm.except_orm(_('No Invoice Address'), _('The Buyer "%s" has no Invoice Address.') % (contact_addr_id,)) inv = { - 'name': 'Auction proforma:' +lot.name, - 'journal_id': lot.auction_id.journal_id.id, - 'partner_id': partner_ref, - 'type': 'out_invoice', + 'name': 'Auction proforma:' +lot.name, + 'journal_id': lot.auction_id.journal_id.id, + 'partner_id': partner_ref, + 'type': 'out_invoice', # 'state':'proforma', } - inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'out_invoice', partner_ref)['value']) + inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', partner_ref)['value']) inv['account_id'] = inv['account_id'] and inv['account_id'][0] inv_id = inv_ref.create(cr, uid, inv, context) invoices[partner_ref] = inv_id - self.write(cr,uid,[lot.id],{'ach_inv_id':inv_id,'state':'sold'}) + self.write(cr, uid, [lot.id], {'ach_inv_id':inv_id, 'state':'sold'}) #calcul des taxes taxes = map(lambda x: x.id, lot.product_id.taxes_id) @@ -681,37 +608,35 @@ class auction_lots(osv.osv): taxes.append(lot.author_right.id) inv_line= { - 'invoice_id': inv_id, - 'quantity': 1, - 'product_id': lot.product_id.id, - 'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name, - 'invoice_line_tax_id': [(6,0,taxes)], - 'account_analytic_id': lot.auction_id.account_analytic_id.id, - 'account_id': lot.auction_id.acc_income.id, - 'price_unit': lot.obj_price, + 'invoice_id': inv_id, + 'quantity': 1, + 'product_id': lot.product_id.id, + 'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name, + 'invoice_line_tax_id': [(6, 0, taxes)], + 'account_analytic_id': lot.auction_id.account_analytic_id.id, + 'account_id': lot.auction_id.acc_income.id, + 'price_unit': lot.obj_price, } - inv_line_obj.create(cr, uid, inv_line,context) - # inv_ref.button_compute(cr, uid, [inv_id]) - # wf_service = netsvc.LocalService('workflow') - # wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr) + inv_line_obj.create(cr, uid, inv_line, context) inv_ref.button_compute(cr, uid, invoice.values()) wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma2', cr) return invoices.values() - # creates the transactions between the auction company and the seller # this is done by creating a new in_invoice for each - def seller_trans_create(self,cr, uid,ids,context): + def seller_trans_create(self, cr, uid, ids, context=None): """ Create a seller invoice for each bord_vnd_id, for selected ids. """ # use each list of object in turn invoices = {} + if not context: + context={} inv_ref=self.pool.get('account.invoice') partner_obj = self.pool.get('res.partner') inv_line_obj = self.pool.get('account.invoice.line') wf_service = netsvc.LocalService('workflow') - for lot in self.browse(cr,uid,ids,context): + for lot in self.browse(cr, uid, ids, context): partner_id = lot.bord_vnd_id.partner_id.id if not lot.auction_id.id: continue @@ -723,17 +648,16 @@ class auction_lots(osv.osv): contact_addr_id = res['contact'] invoice_addr_id = res['invoice'] inv = { - 'name': 'Auction:' +lot.name, - 'journal_id': lot.auction_id.journal_seller_id.id, - 'partner_id': lot.bord_vnd_id.partner_id.id, - 'type': 'in_invoice', + 'name': 'Auction:' +lot.name, + 'journal_id': lot.auction_id.journal_seller_id.id, + 'partner_id': lot.bord_vnd_id.partner_id.id, + 'type': 'in_invoice', } - inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value']) - # inv['account_id'] = inv['account_id'] and inv['account_id'][0] + inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value']) inv_id = inv_ref.create(cr, uid, inv, context) invoices[lot.bord_vnd_id.id] = inv_id - self.write(cr,uid,[lot.id],{'sel_inv_id':inv_id,'state':'sold'}) + self.write(cr, uid, [lot.id], {'sel_inv_id':inv_id, 'state':'sold'}) taxes = map(lambda x: x.id, lot.product_id.taxes_id) if lot.bord_vnd_id.tax_id: @@ -742,16 +666,16 @@ class auction_lots(osv.osv): taxes += map(lambda x: x.id, lot.auction_id.seller_costs) inv_line= { - 'invoice_id': inv_id, - 'quantity': 1, - 'product_id': lot.product_id.id, - 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name, - 'invoice_line_tax_id': [(6,0,taxes)], - 'account_analytic_id': lot.auction_id.account_analytic_id.id, - 'account_id': lot.auction_id.acc_expense.id, - 'price_unit': lot.obj_price, + 'invoice_id': inv_id, + 'quantity': 1, + 'product_id': lot.product_id.id, + 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name, + 'invoice_line_tax_id': [(6, 0, taxes)], + 'account_analytic_id': lot.auction_id.account_analytic_id.id, + 'account_id': lot.auction_id.acc_expense.id, + 'price_unit': lot.obj_price, } - inv_line_obj.create(cr, uid, inv_line,context) + inv_line_obj.create(cr, uid, inv_line, context) inv_ref.button_compute(cr, uid, invoices.values()) for inv in inv_ref.browse(cr, uid, invoices.values(), context): inv_ref.write(cr, uid, [inv.id], { @@ -760,7 +684,7 @@ class auction_lots(osv.osv): wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_open', cr) return invoices.values() - def lots_invoice(self, cr, uid, ids, context,invoice_number=False): + def lots_invoice(self, cr, uid, ids, context, invoice_number=False): """(buyer invoice Create an invoice for selected lots (IDS) to BUYER_ID. Set created invoice to the ACTION state. @@ -773,38 +697,36 @@ class auction_lots(osv.osv): """ dt = time.strftime('%Y-%m-%d') inv_ref = self.pool.get('account.invoice') - partner_r = self.pool.get('res.partner') + res_obj = self.pool.get('res.partner') inv_line_obj = self.pool.get('account.invoice.line') wf_service = netsvc.LocalService('workflow') invoices={} - for lot in self.browse(cr, uid, ids,context): - # partner_ref = lot.ach_uid.id + for lot in self.browse(cr, uid, ids, context): if not lot.auction_id.id: continue if not lot.ach_uid.id: raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,)) - if (lot.auction_id.id,lot.ach_uid.id) in invoices: - inv_id = invoices[(lot.auction_id.id,lot.ach_uid.id)] + if (lot.auction_id.id, lot.ach_uid.id) in invoices: + inv_id = invoices[(lot.auction_id.id, lot.ach_uid.id)] else: - add = partner_r.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address'] + add = res_obj.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address'] if not len(add): raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.')) price = lot.obj_price or 0.0 lot_name =lot.obj_num inv = { - 'name':lot.auction_id.name or '', - 'reference': lot.ach_login, - 'journal_id': lot.auction_id.journal_id.id, - 'partner_id': lot.ach_uid.id, - 'type': 'out_invoice', + 'name':lot.auction_id.name or '', + 'reference': lot.ach_login, + 'journal_id': lot.auction_id.journal_id.id, + 'partner_id': lot.ach_uid.id, + 'type': 'out_invoice', } if invoice_number: inv['number'] = invoice_number - inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'out_invoice', lot.ach_uid.id)['value']) - #inv['account_id'] = inv['account_id'] and inv['account_id'][0] + inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', lot.ach_uid.id)['value']) inv_id = inv_ref.create(cr, uid, inv, context) - invoices[(lot.auction_id.id,lot.ach_uid.id)] = inv_id - self.write(cr,uid,[lot.id],{'ach_inv_id':inv_id,'state':'sold'}) + invoices[(lot.auction_id.id, lot.ach_uid.id)] = inv_id + self.write(cr, uid, [lot.id], {'ach_inv_id':inv_id, 'state':'sold'}) #calcul des taxes taxes = map(lambda x: x.id, lot.product_id.taxes_id) taxes+=map(lambda x:x.id, lot.auction_id.buyer_costs) @@ -812,57 +734,43 @@ class auction_lots(osv.osv): taxes.append(lot.author_right.id) inv_line= { - 'invoice_id': inv_id, - 'quantity': 1, - 'product_id': lot.product_id.id, - 'name': '['+str(lot.obj_num)+'] '+ lot.name, - 'invoice_line_tax_id': [(6,0,taxes)], - 'account_analytic_id': lot.auction_id.account_analytic_id.id, - 'account_id': lot.auction_id.acc_income.id, - 'price_unit': lot.obj_price, + 'invoice_id': inv_id, + 'quantity': 1, + 'product_id': lot.product_id.id, + 'name': '['+str(lot.obj_num)+'] '+ lot.name, + 'invoice_line_tax_id': [(6, 0, taxes)], + 'account_analytic_id': lot.auction_id.account_analytic_id.id, + 'account_id': lot.auction_id.acc_income.id, + 'price_unit': lot.obj_price, } - inv_line_obj.create(cr, uid, inv_line,context) - # inv_ref.button_compute(cr, uid, [inpq tu dis cav_id]) - # inv_ref.button_compute(cr, uid, [inv_id]) + inv_line_obj.create(cr, uid, inv_line, context) inv_ref.button_compute(cr, uid, [inv_id]) for l in inv_ref.browse(cr, uid, invoices.values(), context): - # wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_proforma', cr) - wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_open', cr) + wf_service.trg_validate(uid, 'account.invoice', l.id, 'invoice_open', cr) return invoices.values() - - def numerotate(self, cr, uid, ids): - cr.execute('select auction_id from auction_lots where id=%s', (ids[0],)) - auc_id = cr.fetchone()[0] - cr.execute('select max(obj_num) from auction_lots where auction_id=%s', (auc_id,)) - try: - max = cr.fetchone()[0] - except: - max = 0 - for id in ids: - max+=1 - cr.execute('update auction_lots set obj_num=%s where id=%s', (max, id)) - return [] - auction_lots() #---------------------------------------------------------- # Auction Bids #---------------------------------------------------------- class auction_bid(osv.osv): + """Bid Auctions""" + _name = "auction.bid" - _description="Bid auctions" + _description=__doc__ _order = 'id desc' _columns = { - 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True), - 'contact_tel':fields.char('Contact',size=64), - 'name': fields.char('Bid ID', size=64,required=True), - 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True), - 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'), + 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True), + 'contact_tel':fields.char('Contact', size=64), + 'name': fields.char('Bid ID', size=64, required=True), + 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True), + 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'), } _defaults = { - 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'), + 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'), } + def onchange_contact(self, cr, uid, ids, partner_id): if not partner_id: return {'value': {'contact_tel':False}} @@ -876,13 +784,15 @@ class auction_bid(osv.osv): auction_bid() class auction_lot_history(osv.osv): + """Lot History""" + _name = "auction.lot.history" - _description="Lot history" + _description=__doc__ _columns = { - 'name': fields.date('Date',size=64), - 'lot_id': fields.many2one('auction.lots','Object', required=True, ondelete='cascade'), - 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'), - 'price': fields.float('Withdrawn price', digits=(16,2)) + 'name': fields.date('Date', size=64), + 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'), + 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'), + 'price': fields.float('Withdrawn price', digits=(16, 2)) } _defaults = { 'name': lambda *args: time.strftime('%Y-%m-%d') @@ -893,18 +803,12 @@ class auction_bid_lines(osv.osv): _name = "auction.bid_line" _description="Bid" -# def get_nom(self,cr,uid,ids,*a): -# res = {} -# lots=self.browse(cr,uid,ids) -# for lot in lots: -# res[lot.id] = lot.lot_id.auction_id.name -# return res _columns = { - 'name': fields.char('Bid date',size=64), - 'bid_id': fields.many2one('auction.bid','Bid ID', required=True, ondelete='cascade'), - 'lot_id': fields.many2one('auction.lots','Object', required=True, ondelete='cascade'), - 'call': fields.boolean('To be Called'), - 'price': fields.float('Maximum Price'), + 'name': fields.char('Bid date', size=64), + 'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'), + 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'), + 'call': fields.boolean('To be Called'), + 'price': fields.float('Maximum Price'), 'auction': fields.char(string='Auction Name', size=64) } _defaults = { @@ -921,516 +825,4 @@ class auction_bid_lines(osv.osv): auction_bid_lines() -class report_buyer_auction(osv.osv): - _name = "report.buyer.auction" - _description = "Auction Reporting on buyer view" - _auto = False - _columns = { - 'buyer_login': fields.char('Buyer Login',size=64, readonly=True, select=1), - 'buyer':fields.many2one('res.partner', 'Buyer', readonly=True, select=2), - 'object':fields.integer('No of objects',readonly=True, select=1), - 'total_price':fields.float('Total Adj.', digits=(16,2), readonly=True, select=2), - 'avg_price':fields.float('Avg Adj.', digits=(16,2), readonly=True, select=2), - 'date': fields.date('Create Date', select=1), - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - - } - - def init(self, cr): - cr.execute(''' - create or replace view report_buyer_auction as ( - select - min(al.id) as id, - al.ach_login as "buyer_login", - to_char(al.create_date, 'YYYY-MM-01') as date, - al.ach_uid as "buyer", - ad.id as auction, - count(al.id) as "object", - sum(al.obj_price) as "total_price", - (sum(al.obj_price)/count(al.id)) as "avg_price" - from - auction_lots al, - auction_dates ad - where - ad.id=al.auction_id - group by - to_char(al.create_date, 'YYYY-MM-01'), - al.ach_uid, - ad.id, - al.ach_login - )''') -report_buyer_auction() - -class report_buyer_auction2(osv.osv): - _name = "report.buyer.auction2" - _description = "Auction Reporting on buyer view" - _auto = False - _columns = { - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'buyer_login': fields.char('Buyer Login',size=64, readonly=True, select=True), - 'buyer':fields.many2one('res.partner', 'Buyer', readonly=True, select=2), - 'sumadj':fields.float('Sum of adjustication',readonly=True), - 'gross_revenue':fields.float('Gross Revenue', readonly=True), - 'net_revenue':fields.float('Net Revenue', readonly=True), - 'net_margin':fields.float('Net Margin', readonly=True), - 'date': fields.date('Create Date', required=True) - } - def init(self, cr): - cr.execute(''' - create or replace view report_buyer_auction2 as ( - select - min(al.id) as id, - to_char(al.create_date, 'YYYY-MM-01') as date, - al.ach_login as "buyer_login", - al.ach_uid as "buyer", - sum(al.obj_price) as sumadj, - ad.id as auction, - sum(al.gross_revenue) as gross_revenue, - sum(al.net_revenue) as net_revenue, - avg(al.net_margin) as net_margin - from - auction_lots al, - auction_dates ad - where - al.auction_id=ad.id - group by - al.ach_uid, - al.ach_login, - ad.id, - to_char(al.create_date, 'YYYY-MM-01') - )''') -report_buyer_auction2() - - -class report_seller_auction(osv.osv): - _name = "report.seller.auction" - _description = "Auction Reporting on seller view" - _auto = False - _rec_name = 'date' - _columns = { - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'seller': fields.many2one('res.partner','Seller',readonly=True, select=1), - 'object_number':fields.integer('No of Objects',readonly=True), - 'total_price':fields.float('Total adjudication',readonly=True), - 'avg_price':fields.float('Avg adjudication',readonly=True), - 'avg_estimation':fields.float('Avg estimation',readonly=True), - 'date': fields.date('Create Date', required=True, select=1), - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'State',readonly=True, select=1) - } - - def init(self, cr): - cr.execute(''' - create or replace view report_seller_auction as ( - select - adl.id as auction, - min(al.id) as id, - to_char(adl.auction1, 'YYYY-MM-DD') as date, - ad.partner_id as seller, - count(al.id) as "object_number", - SUM(al.obj_price) as "total_price", - (SUM(al.obj_price)/count(al.id)) as avg_price, - sum(al.lot_est1+al.lot_est2)/2 as avg_estimation, - al.state - from - auction_dates adl, - auction_lots al, - auction_deposit ad - where - al.auction_id=adl.id and ad.id=al.bord_vnd_id - group by - ad.partner_id, - al.state,adl.auction1,adl.id - )''') -report_seller_auction() - -class report_seller_auction2(osv.osv): - _name = "report.seller.auction2" - _description = "Auction Reporting on seller view2" - _auto = False - _rec_name = 'date' - _columns = { - 'seller': fields.many2one('res.partner','Seller',readonly=True, select=1), - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'sum_adj':fields.float('Sum Adjustication',readonly=True, select=2), - 'gross_revenue':fields.float('Gross revenue',readonly=True, select=2), - 'net_revenue':fields.float('Net revenue',readonly=True, select=2), - 'net_margin':fields.float('Net margin', readonly=True, select=2), - 'date': fields.date('Auction date', required=1), - } - - def init(self, cr): - cr.execute('''create or replace view report_seller_auction2 as - (select - min(al.id) as id, - to_char(adl.auction1, 'YYYY-MM-DD') as date, - adl.id as auction, - ad.partner_id as seller, - sum(al.obj_price) as "sum_adj", - sum(al.gross_revenue) as "gross_revenue", - sum(al.net_revenue) as "net_revenue", - avg(al.net_margin) as "net_margin" - from - auction_lots al,auction_dates adl,auction_deposit ad - where - adl.id=al.auction_id and ad.id=al.bord_vnd_id - group by - al.ach_uid,adl.auction1,adl.id,ad.partner_id) - ''') - -report_seller_auction2() - -class report_auction_view2(osv.osv): - _name = "report.auction.view2" - _description = "Auction Reporting on view2" - _auto = False - _rec_name = 'date' - _columns = { - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'sum_adj':fields.float('Sum of adjudication',readonly=True), - 'obj_number':fields.integer('# of Objects',readonly=True), - 'gross_revenue':fields.float('Gross revenue',readonly=True), - 'net_revenue':fields.float('Net revenue',readonly=True), - 'obj_margin':fields.float('Avg margin', readonly=True), - 'obj_margin_procent':fields.float('Net margin (%)', readonly=True), - 'date': fields.date('Auction date', required=True, select=1) - } - def init(self, cr): - cr.execute('''create or replace view report_auction_view2 as ( - select - ad.id as id, - to_char(ad.auction1, 'YYYY-MM-DD') as date, - ad.id as "auction", - count(al.id) as "obj_number", - SUM(al.obj_price) as "sum_adj", - SUM(al.gross_revenue) as "gross_revenue", - SUM(al.net_revenue) as "net_revenue", - avg(al.net_revenue) as "obj_margin", - SUM(al.net_revenue)*100/sum(al.obj_price) as "obj_margin_procent" - from - auction_dates ad - left join - auction_lots al on (al.auction_id = ad.id) - group by - ad.id, ad.auction1 - having - sum(al.obj_price) <> 0 - )''') -report_auction_view2() - -class report_auction_view(osv.osv): - _name = "report.auction.view" - _description = "Auction Reporting on view1" - _auto = False - _rec_name = 'auction_id' - _columns = { - 'auction_id': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'nobjects':fields.float('No of objects',readonly=True), - 'nbuyer':fields.float('No of buyers',readonly=True), - 'nseller':fields.float('No of sellers',readonly=True), - 'min_est':fields.float('Minimum Estimation', readonly=True, select=2), - 'max_est':fields.float('Maximum Estimation', readonly=True, select=2), - 'adj_price':fields.float('Adjudication price', readonly=True, select=2), - 'obj_ret':fields.integer('# obj ret', readonly=True, select=2) - } - - def init(self, cr): - cr.execute('''create or replace view report_auction_view as - (select - min(al.id) as id, - al.auction_id as "auction_id", - count(al.id) as "nobjects", - count(al.ach_login) as "nbuyer", - count(al.bord_vnd_id) as "nseller", - sum(al.lot_est1) as "min_est", - sum(al.lot_est2) as "max_est", - (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret, - sum(al.obj_price) as "adj_price" - from - auction_lots al - group by - al.auction_id - )''') - -report_auction_view() - -class report_auction_object_date(osv.osv): - _name = "report.auction.object.date" - _description = "Objects per day" - _auto = False - _columns = { - 'obj_num': fields.integer('# of Objects'), - 'name': fields.date('Created date', select=2), - 'month': fields.date('Month', select=1), - 'user_id':fields.many2one('res.users', 'User',select=1), - } - #l.create_uid as user, - - def init(self, cr): - cr.execute("""create or replace view report_auction_object_date as - (select - min(l.id) as id, - to_char(l.create_date, 'YYYY-MM-DD') as name, - to_char(l.create_date, 'YYYY-MM-01') as month, - count(l.obj_num) as obj_num, - l.create_uid as user_id - from - auction_lots l - group by - to_char(l.create_date, 'YYYY-MM-DD'), - to_char(l.create_date, 'YYYY-MM-01'), - l.create_uid - ) - """) -report_auction_object_date() - -class report_auction_estimation_adj_category(osv.osv): - _name = "report.auction.estimation.adj.category" - _description = "comparaison estimate/adjudication " - _auto = False - _rec_name='date' - _columns = { - 'lot_est1': fields.float('Minimum Estimation',select=2), - 'lot_est2': fields.float('Maximum Estimation',select=2), -# 'obj_price': fields.float('Adjudication price'), - 'date': fields.date('Date', readonly=True,select=1), - 'lot_type': fields.selection(_type_get, 'Object Type', size=64), - 'adj_total': fields.float('Total Adjudication',select=2), - 'user_id':fields.many2one('res.users', 'User', select=1) - } - - def init(self, cr): - cr.execute(""" - create or replace view report_auction_estimation_adj_category as ( - select - min(l.id) as id, - to_char(l.create_date, 'YYYY-MM-01') as date, - l.lot_type as lot_type, - sum(l.lot_est1) as lot_est1, - sum(l.lot_est2) as lot_est2, - sum(l.obj_price) as adj_total, - l.create_uid as user_id - from - auction_lots l,auction_dates m - where - l.auction_id=m.id and l.obj_price >0 - group by - to_char(l.create_date, 'YYYY-MM-01'),lot_type,l.create_uid - ) - """) -report_auction_estimation_adj_category() - -class report_auction_adjudication(osv.osv): - _name = "report.auction.adjudication" - _description = "report_auction_adjudication" - _auto = False - _columns = { - 'name': fields.many2one('auction.dates','Auction date',readonly=True,select=1), - 'state': fields.selection((('draft','Draft'),('close','Closed')),'State', select=1), - 'adj_total': fields.float('Total Adjudication'), - 'date': fields.date('Date', readonly=True,select=1), - 'user_id':fields.many2one('res.users', 'User',select=1) - - } - - - def init(self, cr): - cr.execute(""" - create or replace view report_auction_adjudication as ( - select - l.id as id, - l.id as name, - sum(m.obj_price) as adj_total, - to_char(l.create_date, 'YYYY-MM-01') as date, - l.create_uid as user_id, - l.state - from - auction_dates l ,auction_lots m - where - m.auction_id=l.id - group by - l.id,l.state,l.name,l.create_uid,to_char(l.create_date, 'YYYY-MM-01') - - ) - """) -report_auction_adjudication() - -class report_attendance(osv.osv): - _name="report.attendance" - _description = "Report Sign In/Out" - _auto = False - #_rec_name='date' - _columns = { - 'name': fields.date('Date', readonly=True,select=1), - 'employee_id' : fields.many2one('hr.employee', "Employee's Name", select=1, readonly=True), - 'total_attendance': fields.float('Total', readonly=True), -} - def init(self, cr): - cr.execute("""CREATE OR REPLACE VIEW report_attendance AS - SELECT - id, - name, - employee_id, - CASE WHEN SUM(total_attendance) < 0 - THEN (SUM(total_attendance) + - CASE WHEN current_date <> name - THEN 1440 - ELSE (EXTRACT(hour FROM current_time) * 60) + EXTRACT(minute FROM current_time) - END - ) - ELSE SUM(total_attendance) - END /60 as total_attendance - FROM ( - SELECT - max(a.id) as id, - a.name::date as name, - a.employee_id, - SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance - FROM hr_attendance a - where name > current_date + interval '-1 day' - GROUP BY a.name::date, a.employee_id - ) AS fs - GROUP BY name,fs.id,employee_id - """) - -report_attendance() - - -class report_deposit_border(osv.osv): - _name="report.deposit.border" - _description = "Report deposit border" - _auto = False - _rec_name='bord' - _columns = { - 'bord': fields.char('Depositer Inventory', size=64, required=True), - 'seller': fields.many2one('res.partner','Seller',select=1), - 'moy_est' : fields.float('Avg. Est', select=1, readonly=True), - 'total_marge': fields.float('Total margin', readonly=True), - 'nb_obj':fields.float('# of objects', readonly=True), -} - def init(self, cr): - cr.execute("""CREATE OR REPLACE VIEW report_deposit_border AS - SELECT - min(al.id) as id, - ab.partner_id as seller, - ab.name as bord, - COUNT(al.id) as nb_obj, - SUM((al.lot_est1 + al.lot_est2)/2) as moy_est, - SUM(al.net_revenue)/(count(ad.id)) as total_marge - - FROM - auction_lots al,auction_deposit ab,auction_dates ad - WHERE - ad.id=al.auction_id - and al.bord_vnd_id=ab.id - GROUP BY - ab.name,ab.partner_id""") -report_deposit_border() - -class report_object_encoded(osv.osv): - _name = "report.object.encoded" - _description = "Object encoded" - _auto = False - _columns = { - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'State', required=True,select=1), - 'user_id':fields.many2one('res.users', 'User', select=1), - 'estimation': fields.float('Estimation',select=2), - 'date': fields.date('Create Date', required=True), -# 'gross_revenue':fields.float('Gross revenue',readonly=True, select=2), -# 'net_revenue':fields.float('Net revenue',readonly=True, select=2), -# 'obj_margin':fields.float('Net margin', readonly=True, select=2), - 'obj_ret':fields.integer('# obj ret', readonly=True, select=2), -# 'adj':fields.integer('Adj.', readonly=True, select=2), - 'obj_num':fields.integer('# of Encoded obj.', readonly=True, select=2), - } - def init(self, cr): - cr.execute('''create or replace view report_object_encoded as - (select min(al.id) as id, - to_char(al.create_date, 'YYYY-MM-DD') as date, - al.state as state, - al.create_uid as user_id, - (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret, - sum((100* al.lot_est1)/al.obj_price) as estimation, - COUNT(al.product_id) as obj_num - from auction_lots al - where al.obj_price>0 and state='draft' - group by to_char(al.create_date, 'YYYY-MM-DD'), al.state, al.create_uid) - ''') -report_object_encoded() - - -class report_object_encoded_manager(osv.osv): - _name = "report.object.encoded.manager" - _description = "Object encoded" - _auto = False - _columns = { - 'user_id':fields.many2one('res.users', 'User', select=True), - 'estimation': fields.float('Estimation',select=True), - 'date': fields.date('Create Date', required=True), - 'gross_revenue':fields.float('Gross revenue',readonly=True, select=True), - 'net_revenue':fields.float('Net revenue',readonly=True, select=True), - 'obj_margin':fields.float('Net margin', readonly=True, select=True), - 'obj_ret':fields.integer('# obj ret', readonly=True, select=True), - 'adj':fields.integer('Adj.', readonly=True, select=True), - 'obj_num':fields.integer('# of Encoded obj.', readonly=True, select=True), - } - def init(self, cr): - cr.execute('''create or replace view report_object_encoded_manager as - (select - min(al.id) as id, - to_char(al.create_date, 'YYYY-MM-DD') as date, - al.create_uid as user_id, - sum((100*lot_est1)/obj_price) as estimation, - (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret, - SUM(al.gross_revenue) as "gross_revenue", - SUM(al.net_revenue) as "net_revenue", - SUM(al.net_revenue)/count(al.id) as "obj_margin", - COUNT(al.product_id) as obj_num, - SUM(al.obj_price) as "adj" - from auction_lots al - where al.obj_price>0 - group by to_char(al.create_date, 'YYYY-MM-DD'), al.create_uid) - ''') -report_object_encoded_manager() - -class report_unclassified_objects(osv.osv): - _name = "report.unclassified.objects" - _description = "Unclassified objects " - _auto = False - _columns = { - 'name': fields.char('Short Description',size=64, required=True), - 'obj_num': fields.integer('Catalog Number'), - 'obj_price': fields.float('Adjudication price'), - 'lot_num': fields.integer('List Number', required=True, select=1 ), - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'State', required=True, readonly=True), - 'obj_comm': fields.boolean('Commission'), - 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True), - 'ach_login': fields.char('Buyer Username',size=64), - 'lot_est1': fields.float('Minimum Estimation'), - 'lot_est2': fields.float('Maximum Estimation'), - 'lot_type': fields.selection(_type_get, 'Object category', size=64), - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - } - def init(self, cr): - cr.execute("""create or replace view report_unclassified_objects as - (select - min(al.id) as id, - al.name as name, - al.obj_price as obj_price, - al.obj_num as obj_num, - al.lot_num as lot_num, - al.state as state, - al.obj_comm as obj_comm, - al.bord_vnd_id as bord_vnd_id, - al.ach_login as ach_login, - al.lot_est1 as lot_est1, - al.lot_est2 as lot_est2, - al.lot_type as lot_type, - al.auction_id as auction - from auction_lots al,auction_lot_category ac - where (al.lot_type=ac.name) AND (ac.aie_categ='41') AND (al.auction_id is null) -group by al.obj_price,al.obj_num, al.lot_num, al.state, al.obj_comm,al.bord_vnd_id,al.ach_login,al.lot_est1,al.lot_est2,al.lot_type,al.auction_id,al.name) - """) -report_unclassified_objects() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/auction/auction_data.xml b/addons/auction/auction_data.xml index 7d742803722..d1f3f94a510 100644 --- a/addons/auction/auction_data.xml +++ b/addons/auction/auction_data.xml @@ -1,98 +1,272 @@ - - Auction Adjudications - 0 - view - - - - - + + + + + + Antiques + ANTI + + + + Painting + PAINT + + + + + Furnitures + FURN + + + + + Porcelain, Ceramics, Glassmaking, ... + PCG + + - - Auction Adjudication Expenses - 0 - view - - - - - + + Sculpture, bronze, eso + SBE + + + + + Clocks and watches + CLW + + + + + Collectible and art objects + COAO + + + + + Engravings + ENGR + + + + + Graphic Arts + GART + + + + + Lightings + LGT + + + + + Metal Ware + MW + + + + + Miniatures + MAT + + + + + Collections + CLT + + + + + Musical Instruments + MI + + + + + Old weapons and militaria + OWM + + + + + Oriental Arts + OART + + + + + Chineese furnitures + CHF + + + + + Others + OTR + + + + + Posters + PST + + + + + Religiosa + REL + + + + + Scientific Instruments + SIN + + + + + Tin + TIN + + + + + Copper wares + CWA + + + + + Toys + TY + + + + + Verreries + VRS + + + + + Wine + WNE + + + + - - Auction Adjudications - 7x* - income - - - - - Auction Adjudication Expenses - 6x* - expense - - - + + Contemporary Art + CONTEM + + + + Arts + ARTS + + + + + Curiosa + CRS + + + + + Other Media + OME + + + + + Photo + PHT + + + + + Painting + CPAINT + + + + + Sculpture + SCUL + + - - Auction Buyer Costs - 7x* - tax - - - - - Auction Seller Costs - 6x* - tax - - - + + Shows + CSHW + + + + + Jewelry + JWL + + + + - - Author rights (4%) - percent - code - 0.04 - sabam - - - result = (price_unit>=1250) - - - Buyer Costs (20%) - percent - 0.20 - auction - - - - - Seller Costs (12%) - percent - -0.12 - auction - - - + + Unclassifieds + UNCLASS + + + + African Arts + AFART + + + + + Argenterie + ARGENT + + + + + Art from the Ivory Coast + ARTFORM + + + + + African Arts + AFRART + + + + + Books, manuscripts, eso. + BME + + + + + Carpet and textilles + CARPTEX + + + + + Cartoons + CATOON + + + + - - - - account.seller.costs - - - - - - - - 770.0 - 700.0 - - + diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml index 22a5cabb1cd..45b157e6545 100644 --- a/addons/auction/auction_demo.xml +++ b/addons/auction/auction_demo.xml @@ -2,6 +2,102 @@ + + + Tax + tax + unreconciled + + + + Auction Adjudications + 0 + view + + + + + + + + + Auction Adjudication Expenses + 1 + view + + + + + + + + + Auction Adjudications + 7x* + + receivable + + + + + + Auction Adjudication Expenses + 6x* + + payable + + + + + + Auction Buyer Costs + 8x* + payable + + + + + + Auction Seller Costs + 9x* + receivable + + + + + + + Author rights (4%) + percent + code + 0.04 + sabam + + + result = (price_unit>=1250) + + + Buyer Costs (20%) + percent + 0.20 + auction + + + + + Seller Costs (12%) + percent + -0.12 + auction + + + + + + 770.0 + 700.0 + + @@ -10,52 +106,52 @@ - Bruxelles1 - Benoit Mortie1r1 - 1030 - + Bruxelles1 + Benoit Mortie1r1 + 1030 + + info@opensides.be + (+32)2 211 34 83 + Rue des Palais 44, bte 33 + default + + - info@opensides.be - (+32)2 211 34 83 - Rue des Palais 44, bte 33 - default - - - - Avignon CEDEX 091 - Laurent Jacot1 - 84911 - - contact@tecsas.fr - (+33)4.32.74.10.57 - 85 rue du traite de Rome - default - - - - Louvain-la-Neuve - Thomas Passot - 1348 - - info@mediapole.net - (+32).10.45.17.73 - Rue de l'Angelique, 1 - - + + Avignon CEDEX 091 + Laurent Jacot1 + 84911 + + contact@tecsas.fr + (+33)4.32.74.10.57 + 85 rue du traite de Rome + default + + + + + Louvain-la-Neuve + Thomas Passot + 1348 + + info@mediapole.net + (+32).10.45.17.73 + Rue de l'Angelique, 1 + + + Philippe Lavilier 1345-1450 + POREAU OSWALD 1877-1955 - - - @@ -98,104 +194,102 @@ sabam - + - TVA - 0.12 - auction - - + TVA + 0.12 + auction + + - - TVA1 - 0.2 - auction - - - + TVA1 + 0.2 + auction + + + - Buyer Costs - 0.21 - auction - - - + Buyer Costs + 0.21 + auction + + + - Seller Costs1 - -0.10 - auction - - - + Seller Costs1 + -0.10 + auction + + + - Seller Costs - -0.10 - auction - - + Seller Costs + -0.10 + auction + + - + - Frais de vente - -0.15 - auction - - + Frais de vente + -0.15 + auction + + - - Frais de vente - 0 - auction - - + + Frais de vente + 0 + auction + + + Oeuvres a 21% - - - - painting + Painting 1 - 8 + + Furniture 2 - 10 - + - glass + Glass 2 - 25 + + - sculpture + Sculpture 10 - 18 + Jawellery 6 - 15 + @@ -203,20 +297,18 @@ - painting Exhibition - - - - - - - - - - - - - + painting Exhibition + + + + + + + + + + + @@ -225,53 +317,47 @@ - - - - - + - - - - - keep + + + keep - - - keep + + + keep - - - keep + + + keep - - - keep + + + keep - - - keep + + + keep @@ -434,7 +520,6 @@ - @@ -451,7 +536,6 @@ - @@ -468,11 +552,8 @@ - - - Hardware photos @@ -487,12 +568,10 @@ - - - + Home Appliance photos 12 @@ -505,10 +584,8 @@ - - mobile accesories photos @@ -527,7 +604,7 @@ - piques-cierges + pikes-candles 14 30 @@ -539,13 +616,11 @@ - - - Service à café + Coffee Service 15 10 @@ -557,16 +632,11 @@ - - - - - - - Pendule + + Pendulum 16 100 200 @@ -581,23 +651,22 @@ - Cassolettes en marbre + Cassolette marble 17 400 500 - marbre Saint Rémi + Marble Saint Remi 150 17 0 - - Tableau + Table 18 1600 2200 @@ -608,39 +677,26 @@ - - - - - - - - - - Vase + + Yourself 19 180 220 - Rouge + Red 0 19 190.00 - - - - - - - Appareil à photos + + Digital photo 20 160 340 @@ -651,22 +707,8 @@ - - - - - - - - - - - - - - bid1 @@ -701,183 +743,191 @@ - bid4 - - + bid4 + + - - + + - bid5 - - + bid5 + + - - + + - bid6 - - + bid6 + + - - + + - bid7 - - + bid7 + + - - + + - bid8 - - + bid8 + + - - + + - bid9 - - + bid9 + + - - + + - bid10 - - + bid10 + + - - + + - - - Demo + + Demo - + - + --> + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + - + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - - - - - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - + diff --git a/addons/auction/auction_report.xml b/addons/auction/auction_report.xml index 17e7e07e968..885c08582ee 100644 --- a/addons/auction/auction_report.xml +++ b/addons/auction/auction_report.xml @@ -3,7 +3,7 @@ - - - --> - - - - - - + model="auction.lots" + name="lots.list.inventory" + rml="auction/report/lots_list_inventory.rml" + multi="1"/> - - ---> - - --> - - - --> - --> - + - + + - - diff --git a/addons/auction/auction_sequence.xml b/addons/auction/auction_sequence.xml index 6cd27d256f3..2ae69235843 100644 --- a/addons/auction/auction_sequence.xml +++ b/addons/auction/auction_sequence.xml @@ -1,30 +1,33 @@ - - # - # Sequences for sale.order - # - + + + - Auction deposit - auction.deposit + Auction deposit + auction.deposit + - Auction deposit - auction.deposit - AD/ - 3 + Auction deposit + auction.deposit + AD/ + 3 + + + - Auction bid - auction.bid + Auction bid + auction.bid + - Auction bid - auction.bid - bid/ - 3 + Auction bid + auction.bid + bid/ + 3 diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index dad4d39b776..9f1ba5b8769 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -5,9 +5,9 @@ - ======================================================= - Auction Management/Configuration/artist - ======================================================= + + + auction.artists.tree auction.artists @@ -40,57 +40,62 @@ form - + - ======================================================= - Auction Management/Configuration/objectcategories - ======================================================= + + + auction.lot.category.tree auction.lot.category tree - - - + + + + auction.lot.category.form auction.lot.category form -
- - - - - - - +
+ + + + + + +
+ auction.lot.category form + - ======================================================= - Auction Management/Auction Dates/New Auction Dates - ======================================================= + + + Auction dates auction.dates tree - - - + + + + + Auction dates auction.dates @@ -98,117 +103,322 @@
- - - - - - - - - - - - - - - - - -