diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 4e2a9a00267..a9c72cbca1f 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-06 03:43+0000\n" +"Last-Translator: munkhbold \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-06 03:45+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,12 +1493,12 @@ 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 @@ -5922,3 +5933,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/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/auction/auction.py b/addons/auction/auction.py index 41c75e0fe7b..a1c21ebcc41 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -72,14 +72,14 @@ class auction_dates(osv.osv): _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'), + '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), @@ -289,6 +289,7 @@ class auction_lots(osv.osv): 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 @@ -343,39 +344,40 @@ class auction_lots(osv.osv): _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), + 'auction_id': fields.many2one('auction.dates', 'Auctions', select=1, help="Auction For Objects"), + 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Auction Deposit For Deposit Inventory"), + 'name': fields.char('Title', size=64, required=True, help='Auction Objects 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'), - 'lot_est1': fields.float('Minimum Estimation'), - 'lot_est2': fields.float('Maximum Estimation'), - 'lot_num': fields.integer('List Number', required=True, select=1), + 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"), + 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price Of Objects"), + 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price Of Objects"), + 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number For selected Object in Deposit"), '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), + '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/Author 2'), + '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'), + 'obj_ret': fields.float('Price retired', help="Objects Ret"), 'obj_comm': fields.boolean('Commission'), - 'obj_price': fields.float('Adjudication price'), + 'obj_price': fields.float('Adjudication price', help="Objects 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', readonly=True), - 'is_ok': fields.boolean('Buyer\'s payment'), + 'ach_uid': fields.many2one('res.partner', 'Buyer'), + 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True, help="Seller who is related to depositor Inventory"), + 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When This Field is True means, Objects is taken away by Buyer"), + 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Account Bank statement', This field is selected as True.", readonly=True), '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(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd"), - 'paid_ach':fields.function(_getprice, string='Buyer invoice reconciled', method=True, type='boolean', store=True, multi="paid_ach"), + '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'), @@ -386,14 +388,14 @@ class auction_lots(osv.osv): \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(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price"), - 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price"), - 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue"), - 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin"), - 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs"), - 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment'), - 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue"), - 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin"), + 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Objects Price which Buyer Given For Objects"), + '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="Revenue Minus Cost Of Objects Sold."), + 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="Gross Income Divided by Net Sales"), + 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Total credit of analytic account"), + 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Account Bank statement Line For Given Buyer"), + 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Total Revenue Minus Returns"), + 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="The ratio of net profits to revenues"), } _defaults = { 'state':lambda *a: 'draft', diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 46d49754d16..8fecd1317eb 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -55,6 +55,7 @@ + auction.lot.category.form auction.lot.category @@ -91,7 +92,6 @@ -