diff --git a/addons/account/account.py b/addons/account/account.py
index a14c44405b9..acf27c42392 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3521,7 +3521,7 @@ class account_bank_accounts_wizard(osv.osv_memory):
_columns = {
'acc_name': fields.char('Account Name.', size=64, required=True),
- 'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
+ 'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True, ondelete='cascade'),
'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
}
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index f2bc9a5c9a1..44411cd637a 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -41,7 +41,7 @@ class bank(osv.osv):
def _prepare_name(self, bank):
"Return the name to use when creating a bank journal"
- return (bank.bank_name or '') + ' ' + bank.acc_number
+ return (bank.bank_name or '') + ' ' + (bank.acc_number or '')
def _prepare_name_get(self, cr, uid, bank_dicts, context=None):
"""Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type"""
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6ca7c21a6e4..6cca8e0ce46 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -256,7 +256,7 @@
-
+
@@ -393,7 +393,7 @@
-
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5e072c3d258..3ce60902d94 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -347,6 +347,15 @@
res_model="account.move.line"
src_model="account.account"/>
+
+
+
account.journal.tree
@@ -841,6 +850,16 @@
res_model="account.move.line"
src_model="account.tax.code"/>
+
+
+
+
account.tax.tree
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 0406efd4526..949d03324f3 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -155,11 +155,13 @@
Validated
account.invoice
+
Invoice validated
Paid
account.invoice
+
Invoice paid
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index fd411c956d0..477d850028b 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-08-07 07:42+0000\n"
-"Last-Translator: gobi \n"
+"PO-Revision-Date: 2013-02-07 11:05+0000\n"
+"Last-Translator: Altangerel \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: 2012-12-22 05:32+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-02-08 04:36+0000\n"
+"X-Generator: Launchpad (build 16482)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,6 +27,8 @@ msgstr "Системийн төлөлт"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
+"Ижил дансууд дээр татварын харгалзаа нь зөвхөн нэг л удаа тодорхойлогдох "
+"боломжтой."
#. module: account
#: help:account.tax.code,sequence:0
@@ -81,7 +83,7 @@ msgstr "Нэхэмжлэх эсвэл төлбөрөөс импортлох"
#: code:addons/account/account_move_line.py:1211
#, python-format
msgid "Bad Account!"
-msgstr ""
+msgstr "Буруу данс!"
#. module: account
#: view:account.move:0
@@ -95,6 +97,8 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
+"Алдаа!\n"
+"Тойрог хамааралтай дансны үлгэрийг үүсгэх боломжгүй."
#. module: account
#. openerp-web
@@ -166,6 +170,9 @@ msgid ""
"which is set after generating opening entries from 'Generate Opening "
"Entries'."
msgstr ""
+"Энэ санхүүгийн жилд 'Жилийн хаалтын бичилтийн журнал'-г тохируулах "
+"шаардлагатай. Энэ нь 'Нээлтийн бичилтийг үүсгэх'-г сонгож нээлтийн бичилт "
+"үүсгэхэд утгууд нь оноогдоно."
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -184,6 +191,13 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Энд дарж мөчлөг нэмнэ.\n"
+"
\n"
+" Мөчлөг нь ихэвчлэн сар эсвэл улиралаар байдаг. \n"
+" Энэ нь ихэвчлэн татвар тайлагнах мөчлөгтэй ижил байна.\n"
+"
\n"
+" "
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -198,7 +212,7 @@ msgstr "Баганын Шошго"
#. module: account
#: help:account.config.settings,code_digits:0
msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Дансны кодын оронгийн тоо"
#. module: account
#: help:account.analytic.journal,type:0
@@ -218,6 +232,9 @@ msgid ""
"lines for invoices. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
+"Нэхэмжлэлийн татварын мөрүүд дээр анхны утга болж ашиглагдах шинжилгээний "
+"дансыг тохируул. Хэрэв татварын мөрүүдэд шинжилгээний данс хэрэглэхээргүй "
+"бол хоосон үлдээ."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -243,12 +260,12 @@ msgstr "Белги тайлан"
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_validated
msgid "Validated"
-msgstr ""
+msgstr "батлагдах"
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
-msgstr ""
+msgstr "Орлого харах"
#. module: account
#: help:account.account,user_type:0
@@ -264,7 +281,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
msgid "Next credit note number"
-msgstr ""
+msgstr "Дараагийн кредитийн дугаарын тэмдэглэл"
#. module: account
#: help:account.config.settings,module_account_voucher:0
@@ -273,6 +290,10 @@ msgid ""
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
msgstr ""
+"Энэ нь банк, касс, борлуулалт, худалдан авалт, зардал, гэрээ зэрэгт "
+"хэрэглэгдэх бүх үндсэн шаардлагуудыг агуулдаг.\n"
+" Энэ нь "
+"account_voucher модулийг суулгадаг."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -304,6 +325,15 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Захиалагчийн буцаалдтыг үүсгэхийн тулд дарна уу. \n"
+"
\n"
+" Буцаалт нь нэхэмжлэлийг бүхэлд эсвэл хэсэгчлэн барагдуулна.\n"
+"
\n"
+" Захиалагчийн буцаалтын гараар үүсгэхийн оронд шууд холбогдох "
+"нэхэмжлэлээс үүсгэх боломжтой.\n"
+"
\n"
+" "
#. module: account
#: help:account.installer,charts:0
@@ -322,7 +352,7 @@ msgstr "Дансны тулгалтыг арилгах"
#. module: account
#: field:account.config.settings,module_account_budget:0
msgid "Budget management"
-msgstr ""
+msgstr "Төсвийн менежмент"
#. module: account
#: view:product.template:0
@@ -344,7 +374,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,group_multi_currency:0
msgid "Allow multi currencies"
-msgstr ""
+msgstr "Олон төрлийн валют ашиглах"
#. module: account
#: code:addons/account/account_invoice.py:73
@@ -365,12 +395,12 @@ msgstr "6 сар"
#: code:addons/account/wizard/account_automatic_reconcile.py:148
#, python-format
msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "тулгах данснуудыг сонгох хэрэгтэй."
#. module: account
#: help:account.config.settings,group_analytic_accounting:0
msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Та аналитик данс хэрэглэхийг зөвшөөрөх."
#. module: account
#: view:account.invoice:0
@@ -378,7 +408,7 @@ msgstr ""
#: view:account.invoice.report:0
#: field:account.invoice.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Худалдагч"
#. module: account
#: view:account.bank.statement:0
@@ -405,7 +435,7 @@ msgstr "Худалдан авалтын буцаалт"
#. module: account
#: selection:account.journal,type:0
msgid "Opening/Closing Situation"
-msgstr "Нээх / Хаах Нөхцөл"
+msgstr "Нээх/Хаах нөхцөл байдал"
#. module: account
#: help:account.journal,currency:0
@@ -444,7 +474,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
-msgstr ""
+msgstr "Хугацаа"
#. module: account
#: field:account.account.template,chart_template_id:0
@@ -457,7 +487,7 @@ msgstr "Загвар дансны мод"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Modify: create refund, reconcile and create a new draft invoice"
-msgstr ""
+msgstr "Өөрчлөх: буцаалт үүсгэж, тулгаад шинэ ноорог нэхэмжлэлийг үүсгэх"
#. module: account
#: help:account.config.settings,tax_calculation_rounding_method:0
@@ -485,7 +515,7 @@ msgstr "Гүйлгээний валютаар илэрхийлэгдэх дүн"
#. module: account
#: view:account.journal:0
msgid "Available Coins"
-msgstr ""
+msgstr "Боломжит зооснууд"
#. module: account
#: field:accounting.report,enable_filter:0
@@ -538,7 +568,7 @@ msgstr "Эцэг бай"
#. module: account
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Нэхэмжлэлийг харуулахад энэ мөрний дарааллийг өгнө."
#. module: account
#: field:account.bank.statement,account_id:0
@@ -607,12 +637,12 @@ msgstr "Нягтлан ордерийн гүйлгээг батлана."
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
#, python-format
msgid "Nothing to reconcile"
-msgstr ""
+msgstr "тулгах зүйл алга"
#. module: account
#: field:account.config.settings,decimal_precision:0
msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Журналын бичилтүүдийн оронгийн нарийвчлал"
#. module: account
#: selection:account.config.settings,period:0
@@ -623,7 +653,7 @@ msgstr "3 сараар"
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
-msgstr "Дараалал"
+msgstr "Дарааллууд"
#. module: account
#: field:account.financial.report,account_report_id:0
@@ -638,6 +668,8 @@ msgid ""
"Specified journal does not have any account move entries in draft state for "
"this period."
msgstr ""
+"Өгөгдсөн журналд идэвхитэй мөчлөгт ноорог төлөвт байгаа дансны ямар ч "
+"хөдөлгөөн байхгүй байна."
#. module: account
#: view:account.fiscal.position:0
@@ -660,12 +692,12 @@ msgstr "Үндсэн дараалал нь одоогийн дарааллаас
#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "Одоогийн валютын тохиргоо зөв хийгдээгүй байна."
#. module: account
#: field:account.journal,profit_account_id:0
msgid "Profit Account"
-msgstr ""
+msgstr "Орлогын данс"
#. module: account
#: code:addons/account/account_move_line.py:1157
@@ -690,7 +722,7 @@ msgstr "SAJ"
#: code:addons/account/account.py:1551
#, python-format
msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "Дараахаас өөр валютаар хөдөлгөөнийг үүсгэж болохгүй .."
#. module: account
#: model:email.template,report_name:account.email_template_edi_invoice
@@ -698,6 +730,8 @@ msgid ""
"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
"and 'draft' or ''}"
msgstr ""
+"Нэхэмжлэл_${(object.number or '').replace('/','_')}_${object.state == "
+"'draft' and 'draft' or ''}"
#. module: account
#: view:account.period:0
@@ -725,6 +759,7 @@ msgstr "Журналын мөчлөг"
msgid ""
"You cannot create more than one move per period on a centralized journal."
msgstr ""
+"Төвлөрсөн журналд мөчлөгийн хэмжээнд нэгээс дээш хөдөлгөөн хийх боломжгүй"
#. module: account
#: help:account.tax,account_analytic_paid_id:0
@@ -748,12 +783,12 @@ msgstr "Авлагын данс"
#. module: account
#: view:account.config.settings:0
msgid "Configure your company bank accounts"
-msgstr ""
+msgstr "Танай компани дансны тохиргоо"
#. module: account
#: view:account.invoice.refund:0
msgid "Create Refund"
-msgstr ""
+msgstr "Буцаалт үүсгэх"
#. module: account
#: constraint:account.move.line:0
@@ -767,7 +802,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
msgid "General Ledger Report"
-msgstr "Ерөнхий дэвтэр"
+msgstr "Ерөнхий тайлан"
#. module: account
#: view:account.invoice:0
@@ -783,7 +818,7 @@ msgstr "Та гүйлгээ үүсгэхдээ итгэлтэй байна уу?
#: code:addons/account/account_invoice.py:1329
#, python-format
msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "Хэсэгчлэн төлсөн нэхэмжлэл: %s %s of %s%s (%s%s үлдэгдэл)."
#. module: account
#: view:account.invoice:0
@@ -876,7 +911,7 @@ msgstr "Ханган Нийлүүлэгчийн Нэхэмжлэх болон З
#: code:addons/account/account_move_line.py:854
#, python-format
msgid "Entry is already reconciled."
-msgstr ""
+msgstr "Аль хэдийн зассан бичилт"
#. module: account
#: view:account.move.line.unreconcile.select:0
@@ -888,12 +923,12 @@ msgstr "Тулгалтыг арилгах"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
msgid "Account Analytic Journal"
-msgstr "Аналитик журнал"
+msgstr "Аналитик дансны журнал"
#. module: account
#: view:account.invoice:0
msgid "Send by Email"
-msgstr ""
+msgstr "Е-майл илгээх"
#. module: account
#: help:account.central.journal,amount_currency:0
@@ -913,7 +948,7 @@ msgstr "J.C./Гүйлгээний нэр"
#. module: account
#: view:account.account:0
msgid "Account Code and Name"
-msgstr ""
+msgstr "Дансны код болон нэр"
#. module: account
#: selection:account.entries.report,month:0
@@ -944,6 +979,10 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Журналын бичилт олдсонгүй.\n"
+"
\n"
+" "
#. module: account
#: code:addons/account/account.py:1637
@@ -990,12 +1029,12 @@ msgstr "Төлөлт"
#. module: account
#: field:account.config.settings,purchase_journal_id:0
msgid "Purchase journal"
-msgstr ""
+msgstr "Худалдан авалтын журнал"
#. module: account
#: model:mail.message.subtype,description:account.mt_invoice_paid
msgid "Invoice paid"
-msgstr ""
+msgstr "Төлбөртэй нэхэмжлэл"
#. module: account
#: view:validate.account.move:0
@@ -1013,7 +1052,7 @@ msgstr "Нийт дүн"
#. module: account
#: help:account.invoice,supplier_invoice_number:0
msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "Хангагдсан нийлүүлэгчийн нэхэмжлэлийн тайлбар."
#. module: account
#: selection:account.account,type:0
@@ -1101,7 +1140,7 @@ msgstr "Код"
#. module: account
#: view:account.config.settings:0
msgid "Features"
-msgstr ""
+msgstr "Чанарууд"
#. module: account
#: code:addons/account/account.py:2298
@@ -1146,7 +1185,7 @@ msgstr "Дансны нэр."
#. module: account
#: field:account.journal,with_last_closing_balance:0
msgid "Opening With Last Closing Balance"
-msgstr ""
+msgstr "Сүүлчийн Хаалтын Балансаар нээж байна."
#. module: account
#: help:account.tax.code,notprintable:0
@@ -1182,13 +1221,13 @@ msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Refund "
-msgstr ""
+msgstr "Буцаалт "
#. module: account
#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "\"%s\" бараанд зарлагын данс тодорхойлогдоогүй байна (id:%d)"
#. module: account
#: view:account.tax:0
@@ -1210,7 +1249,7 @@ msgstr "Кассын орлого зарлага"
#. module: account
#: field:account.config.settings,sale_refund_journal_id:0
msgid "Sale refund journal"
-msgstr ""
+msgstr "Борлуулалтын буцаалтын журнал"
#. module: account
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1246,7 +1285,7 @@ msgstr "Мөчлөг эхлэх"
#. module: account
#: view:account.tax:0
msgid "Refunds"
-msgstr ""
+msgstr "Буцаалтууд"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1321,7 +1360,7 @@ msgstr "Гаралтын валютын ханш"
#. module: account
#: field:account.config.settings,chart_template_id:0
msgid "Template"
-msgstr ""
+msgstr "Үлгэр"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1413,7 +1452,7 @@ msgstr "Төвшин"
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "Та зөвхөн ноорог нэхэмжлэлийн валют өөрчлөх боломжтой."
#. module: account
#: report:account.invoice:0
@@ -1484,12 +1523,12 @@ msgstr "Тайлангийн өгөгдөл"
#. module: account
#: field:account.fiscalyear.close.state,fy_id:0
msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Хаах санхүүгийн жил"
#. module: account
#: field:account.config.settings,sale_sequence_prefix:0
msgid "Invoice sequence"
-msgstr ""
+msgstr "Нэхэмжлэлийн дараалал"
#. module: account
#: model:ir.model,name:account.model_account_entries_report
@@ -1508,11 +1547,13 @@ msgid ""
"And after getting confirmation from the bank it will be in 'Confirmed' "
"status."
msgstr ""
+"Шинэ хуулга үүсгэсэн бол төлөв нь \"Ноорог\" болно.\n"
+"дараа нь банк батламжлавал \"Батлагдсан \" төлөвтэй болно."
#. module: account
#: field:account.invoice.report,state:0
msgid "Invoice Status"
-msgstr ""
+msgstr "Нэхэмжлэлийн Төлөв"
#. module: account
#: view:account.bank.statement:0
@@ -1534,7 +1575,7 @@ msgstr "Авлагын данс"
#: code:addons/account/account.py:768
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (хуулбар)"
#. module: account
#: selection:account.balance.report,display_account:0
@@ -1550,7 +1591,7 @@ msgstr "Баланс нь тэгээс ялгаатай"
msgid ""
"There is no default debit account defined \n"
"on journal \"%s\"."
-msgstr ""
+msgstr "\"%s\" журналын өгөгдмөл дебит данс тодорхойлогдоогүй."
#. module: account
#: view:account.tax:0
@@ -1585,6 +1626,9 @@ msgid ""
"There is nothing to reconcile. All invoices and payments\n"
" have been reconciled, your partner balance is clean."
msgstr ""
+"Тулгах зүйл алга. Бүх нэхэмжлэл болон төлбөрүүд\n"
+" тулгагдсан байна, таны харилцагчийн баланс цэвэрхэн "
+"байна."
#. module: account
#: field:account.chart.template,code_digits:0
@@ -1603,7 +1647,7 @@ msgstr "Гараар үүсгэх үед 'Ноорог' төлвийг алга
#: code:addons/account/wizard/account_report_common.py:164
#, python-format
msgid "Not implemented."
-msgstr ""
+msgstr "Хэрэгжүүлээгүй."
#. module: account
#: view:account.invoice.refund:0
@@ -1613,12 +1657,12 @@ msgstr "Кредитийн тэмдэглэл"
#. module: account
#: view:account.config.settings:0
msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "цНэхэмжлэх ба Төлбөр"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Cost Ledger for Period"
-msgstr ""
+msgstr "Мөчлөгийн Өртөгийн дэвтэр"
#. module: account
#: view:account.entries.report:0
@@ -1695,7 +1739,7 @@ msgstr "Татваргүй"
#. module: account
#: view:account.journal:0
msgid "Advanced Settings"
-msgstr ""
+msgstr "Өргөтгөсөн Тохиргоо"
#. module: account
#: view:account.bank.statement:0
@@ -1778,7 +1822,7 @@ msgstr "Нэхэмжлэл"
#. module: account
#: field:account.move,balance:0
msgid "balance"
-msgstr ""
+msgstr "баланс"
#. module: account
#: model:process.node,note:account.process_node_analytic0
@@ -1794,7 +1838,7 @@ msgstr "Санхүүгийн жилийн дугаарлалт"
#. module: account
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
-msgstr ""
+msgstr "Шинжилгээний санхүү"
#. module: account
#: report:account.overdue:0
@@ -1824,7 +1868,7 @@ msgstr "Борлуулалт дансны төрлөөр"
#: model:account.payment.term,name:account.account_payment_term_15days
#: model:account.payment.term,note:account.account_payment_term_15days
msgid "15 Days"
-msgstr ""
+msgstr "15 өдөр"
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1849,7 +1893,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:857
#, python-format
msgid "Some entries are already reconciled."
-msgstr ""
+msgstr "Зарим бичилтүүд хэдийнээ тулгагдсан байна"
#. module: account
#: field:account.tax.code,sum:0
@@ -1876,7 +1920,7 @@ msgstr "Хүлээгдэж буй данс"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Cancel Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Санхүүгийн жилийн нээлтийн бичилтийг цуцлах"
#. module: account
#: report:account.journal.period.print.sale.purchase:0
@@ -1906,18 +1950,18 @@ msgstr "Авлага & Өглөг"
#. module: account
#: field:account.config.settings,module_account_payment:0
msgid "Manage payment orders"
-msgstr ""
+msgstr "Төлбөрийн захиалгын менежмент"
#. module: account
#: view:account.period:0
msgid "Duration"
-msgstr ""
+msgstr "Үргэлжлэх хугацаа"
#. module: account
#: view:account.bank.statement:0
#: field:account.bank.statement,last_closing_balance:0
msgid "Last Closing Balance"
-msgstr ""
+msgstr "Сүүлчийн Хаалтын Баланс"
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
@@ -1949,7 +1993,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 tax declaration."
-msgstr ""
+msgstr "Энэ кодыг татварын тодорхойлолтонд хэрэглэ."
#. module: account
#: help:account.period,special:0
@@ -1964,12 +2008,12 @@ msgstr "Ноорог ордер"
#. module: account
#: model:mail.message.subtype,description:account.mt_invoice_validated
msgid "Invoice validated"
-msgstr ""
+msgstr "Нэхэмжлэл батлагдлаа"
#. module: account
#: field:account.config.settings,module_account_check_writing:0
msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Нийлүүлэгчдээ чекээр төлөх"
#. module: account
#: field:account.move.line.reconcile,credit:0
@@ -1980,7 +2024,7 @@ msgstr "Кредит дүн"
#: field:account.bank.statement,message_ids:0
#: field:account.invoice,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Зурвасууд"
#. module: account
#: view:account.vat.declaration:0
@@ -2078,7 +2122,7 @@ msgstr "Нэхэмжлэл шинжилгээ"
#. module: account
#: model:ir.model,name:account.model_mail_compose_message
msgid "Email composition wizard"
-msgstr ""
+msgstr "Имэйл үүсгэх харилцах цонх"
#. module: account
#: model:ir.model,name:account.model_account_period_close
@@ -2092,6 +2136,8 @@ msgid ""
"This journal already contains items for this period, therefore you cannot "
"modify its company field."
msgstr ""
+"Энэ журнал энэхүү мөчлөгт бичилт агуулсан учраас та компаний талбарыг "
+"өөрчлөх боломжгүй."
#. module: account
#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
@@ -2124,7 +2170,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,currency_id:0
msgid "Default company currency"
-msgstr ""
+msgstr "Компаний үндсэн валют"
#. module: account
#: field:account.invoice,move_id:0
@@ -2172,7 +2218,7 @@ msgstr "Хүчинтэй"
#: field:account.bank.statement,message_follower_ids:0
#: field:account.invoice,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Дагагчид"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -2192,6 +2238,8 @@ msgid ""
"You cannot change the type of account to '%s' type as it contains journal "
"items!"
msgstr ""
+"Та дансны төрлийг '%s' төрлөөр солих боломжгүй учир нь журналын бичилт "
+"агуулж байна!"
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2201,19 +2249,21 @@ msgstr "Харилцагчийн балансын насжилт тайлан"
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Санхүүгийн жил хаах"
#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
-msgstr ""
+msgstr "Журнал:"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
msgid "A tax fiscal position could be defined only once time on same taxes."
msgstr ""
+"Ижил дансууд дээр татварын жилийн харгалзаа нь зөвхөн нэг л удаа "
+"тодорхойлогдох боломжтой."
#. module: account
#: view:account.tax:0
@@ -2225,12 +2275,12 @@ msgstr "Татварын тодорхойлолт"
#: view:account.config.settings:0
#: model:ir.actions.act_window,name:account.action_account_config
msgid "Configure Accounting"
-msgstr ""
+msgstr "Санхүүгийн тохиргоо"
#. module: account
#: field:account.invoice.report,uom_name:0
msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Хэмжих нэгжийн код"
#. module: account
#: help:account.journal,allow_date:0
@@ -2246,12 +2296,12 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
#, python-format
msgid "Good job!"
-msgstr ""
+msgstr "Сайн ажиллалаа!"
#. module: account
#: field:account.config.settings,module_account_asset:0
msgid "Assets management"
-msgstr ""
+msgstr "Хөрөнгийн менежмент"
#. module: account
#: view:account.account:0
@@ -2307,6 +2357,7 @@ msgid ""
"If you want the journal should be control at opening/closing, check this "
"option"
msgstr ""
+"Хэрэв та Журналаа нээх/хаах-aд хяналт хийхийг хүсвэл, энэ талбарийг сонгоно."
#. module: account
#: view:account.bank.statement:0
@@ -2347,7 +2398,7 @@ msgstr "Нээлттэй бичилтүүд"
#. module: account
#: field:account.config.settings,purchase_refund_sequence_next:0
msgid "Next supplier credit note number"
-msgstr ""
+msgstr "Дараагийн нийлүүлэгчийн кредитийн тэмдэглэл дугаар"
#. module: account
#: field:account.automatic.reconcile,account_ids:0
@@ -2393,12 +2444,12 @@ msgstr "30 Цэвэр өдөрүүд"
#: code:addons/account/account_cash_statement.py:256
#, python-format
msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Таньд энэ %sжурналийг нээх эрх байхгүй байна!"
#. module: account
#: model:res.groups,name:account.group_supplier_inv_check_total
msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Нийт нийлүүлэгчийн нэхэмжлэл шалгах"
#. module: account
#: selection:account.invoice,state:0
@@ -2473,7 +2524,7 @@ msgstr "Орлогын данс"
#. module: account
#: help:account.config.settings,default_sale_tax:0
msgid "This sale tax will be assigned by default on new products."
-msgstr ""
+msgstr "Энэхүү борлуулалтын татвар шинэ бараанд анхны утгаар оноогдоно."
#. module: account
#: report:account.general.ledger_landscape:0
@@ -2563,6 +2614,8 @@ msgid ""
"You cannot change the type of account from 'Closed' to any other type as it "
"contains journal items!"
msgstr ""
+"Та дансны төрлийг \"Хаагдсан\" -аас өөр төрлөөр солих боломжгүй учир нь "
+"журналын бичилт агуулж байна!"
#. module: account
#: field:account.invoice.report,account_line_id:0
@@ -2572,7 +2625,7 @@ msgstr "Санхүүгийн мөр"
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "Энэхүү үлгэрээр суурилж данс үүсгэх"
#. module: account
#: code:addons/account/account_invoice.py:905
@@ -2625,7 +2678,7 @@ msgstr "Санхүүгийн харгалзаа"
#: code:addons/account/account_move_line.py:578
#, python-format
msgid "You cannot create journal items on a closed account %s %s."
-msgstr ""
+msgstr "Та хаагдсан %s %s дансанд журналын бичилт үүсгэх боломжгүй"
#. module: account
#: field:account.period.close,sure:0
@@ -2646,12 +2699,12 @@ msgstr "Ноорог төлөвтэй нэхэмжлэл"
#. module: account
#: view:product.category:0
msgid "Account Properties"
-msgstr ""
+msgstr "Дансны шинж чанарууд"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft refund"
-msgstr ""
+msgstr "Ноорог буцаалт үүсгэх"
#. module: account
#: view:account.partner.reconcile.process:0
@@ -2661,7 +2714,7 @@ msgstr "Харилцагчийн тулгалт"
#. module: account
#: view:account.analytic.line:0
msgid "Fin. Account"
-msgstr ""
+msgstr "Санх.Данс"
#. module: account
#: field:account.tax,tax_code_id:0
@@ -2781,7 +2834,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,purchase_sequence_next:0
msgid "Next supplier invoice number"
-msgstr ""
+msgstr "Дараачийн нийлүүлэгчийн нэхэмжлэлийн дугаар"
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
@@ -2830,7 +2883,7 @@ msgstr "Аналитик данс"
#: field:account.config.settings,default_purchase_tax:0
#: field:account.config.settings,purchase_tax:0
msgid "Default purchase tax"
-msgstr ""
+msgstr "Үндсэн худалдан авалтын татвар"
#. module: account
#: view:account.account:0
@@ -2863,7 +2916,7 @@ msgstr "Тохиргооны алдаа!"
#: code:addons/account/account_bank_statement.py:433
#, python-format
msgid "Statement %s confirmed, journal items were created."
-msgstr ""
+msgstr "Хуулга %s батлагдлаа, журналын бичилтүүд үүслээ."
#. module: account
#: field:account.invoice.report,price_average:0
@@ -2916,7 +2969,7 @@ msgstr "Дугаар"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Purchase Tax"
-msgstr ""
+msgstr "Худалдан авалтын Татвар"
#. module: account
#: help:account.move.line,tax_code_id:0
@@ -3013,7 +3066,7 @@ msgstr "Ажил гүйлгээ"
#. module: account
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Данс болон мөчлөг нь нэг компанид харъяалагдах ёстой"
#. module: account
#: field:account.invoice.line,discount:0
@@ -3043,7 +3096,7 @@ msgstr "Зөрүү дүн"
#: field:account.bank.statement,message_unread:0
#: field:account.invoice,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Уншаагүй зурвасууд"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@@ -3052,12 +3105,14 @@ msgid ""
"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state."
msgstr ""
+"Сонгогдсон нэхэмжлэл(үүд) батлагдах боломжгүй учир нь 'Ноорог' эсвэл "
+"'Урьдчилсан' төлөвт ороогүй байна."
#. module: account
#: code:addons/account/account.py:1062
#, python-format
msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "Та ижил компанид харъяалагдах мөчлөгүүдийг сонгоно уу."
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3070,17 +3125,17 @@ msgstr "Борлуулалт дансаар"
#: code:addons/account/account.py:1411
#, python-format
msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Та илгээгдсэн журналын бичилт \"%s\" устгах боломжгүй."
#. module: account
#: view:account.invoice:0
msgid "Accounting Period"
-msgstr ""
+msgstr "Санхүүгийн мөчлөг"
#. module: account
#: field:account.config.settings,sale_journal_id:0
msgid "Sale journal"
-msgstr ""
+msgstr "Борлуулалтын Журнал"
#. module: account
#: code:addons/account/account.py:2298
@@ -3097,6 +3152,7 @@ msgid ""
"This journal already contains items, therefore you cannot modify its company "
"field."
msgstr ""
+"Энэ журнал бичилт агуулсан учраас та компани талбарыг өөрчлөх боломжгүй."
#. module: account
#: code:addons/account/account.py:409
@@ -3142,7 +3198,7 @@ msgstr "8 сар"
#. module: account
#: field:accounting.report,debit_credit:0
msgid "Display Debit/Credit Columns"
-msgstr ""
+msgstr "Дебит/кредит багана харуулах"
#. module: account
#: selection:account.entries.report,month:0
@@ -3167,12 +3223,12 @@ msgstr ""
#: view:account.unreconcile:0
#: view:account.unreconcile.reconcile:0
msgid "Unreconcile Transactions"
-msgstr ""
+msgstr "Гүйлгээний тулгалтыг арилгах"
#. module: account
#: field:wizard.multi.charts.accounts,only_one_chart_template:0
msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Ганцхан модны үлгэр байна"
#. module: account
#: view:account.chart.template:0
@@ -3185,7 +3241,7 @@ msgstr "Зардлын данс"
#: field:account.bank.statement,message_summary:0
#: field:account.invoice,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Дүгнэлт"
#. module: account
#: help:account.invoice,period_id:0
@@ -3364,7 +3420,7 @@ msgstr "Дансны дугаарт хэрэглэх тэмдэгтийн хэм
#. module: account
#: field:res.partner,property_supplier_payment_term:0
msgid "Supplier Payment Term"
-msgstr ""
+msgstr "Нийлүүлэгчийн төлбөрийн нөхцөл"
#. module: account
#: view:account.fiscalyear:0
@@ -3381,6 +3437,7 @@ msgstr "Байнга"
msgid ""
"Full accounting features: journals, legal statements, chart of accounts, etc."
msgstr ""
+"Бүрэн санхүүгийн боломж: журнал, албан ёсны хуулга, дансны мод, r.м."
#. module: account
#: view:account.analytic.line:0
@@ -3437,12 +3494,12 @@ msgstr "Электроник файл"
#. module: account
#: field:account.move.line,reconcile:0
msgid "Reconcile Ref"
-msgstr ""
+msgstr "Тулгалтын Сурвалж"
#. module: account
#: field:account.config.settings,has_chart_of_accounts:0
msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "Компани нь дансны модтой байна"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
@@ -3542,7 +3599,7 @@ msgstr ""
#. module: account
#: view:account.period:0
msgid "Account Period"
-msgstr ""
+msgstr "Дансны мөчлөг"
#. module: account
#: help:account.account,currency_id:0
@@ -3570,7 +3627,7 @@ msgstr "Дансны модны загвар"
#. module: account
#: view:account.bank.statement:0
msgid "Transactions"
-msgstr ""
+msgstr "Гүйлгээ"
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3671,7 +3728,7 @@ msgstr "Санхүүгийн Аппликэшний Тохиргоо"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
msgid "Account Tax Declaration"
-msgstr ""
+msgstr "Дансны Татварын Тодорхойлолт"
#. module: account
#: help:account.bank.statement,name:0
@@ -3760,6 +3817,10 @@ msgid ""
"You can create one in the menu: \n"
"Configuration/Journals/Journals."
msgstr ""
+"Энэ компанид %s төрөлтэй санхүүгийн журнал олдсонгүй.\n"
+"\n"
+"Та цэс дээр үүсгэж болно: \n"
+"Тохиргоо/Журнал/Журнал."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3836,7 +3897,7 @@ msgstr "Шилжүүлэлт"
#. module: account
#: field:account.config.settings,expects_chart_of_accounts:0
msgid "This company has its own chart of accounts"
-msgstr ""
+msgstr "Энэ компани нь өөрийн дансны модтой байна"
#. module: account
#: view:account.chart:0
@@ -3847,7 +3908,7 @@ msgstr "Дансны мод"
#: view:cash.box.out:0
#: model:ir.actions.act_window,name:account.action_cash_box_out
msgid "Take Money Out"
-msgstr ""
+msgstr "Мөнгийг гадагш авах"
#. module: account
#: report:account.vat.declaration:0
@@ -4177,7 +4238,7 @@ msgstr "Өглөгийн данс"
#: code:addons/account/wizard/account_fiscalyear_close.py:88
#, python-format
msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "Нээлтийн бичилтийг үүсгэх мөчлөг олдохгүй байна."
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -4272,7 +4333,7 @@ msgstr ""
#: help:account.bank.statement,message_ids:0
#: help:account.invoice,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Зурвас болон харилцсан түүх"
#. module: account
#: help:account.journal,analytic_journal_id:0
@@ -4343,7 +4404,7 @@ msgstr "Нэгтгэсэн дэд дансууд"
#: code:addons/account/wizard/account_invoice_refund.py:146
#, python-format
msgid "Insufficient Data!"
-msgstr ""
+msgstr "Хангалтгүй өгөгдөл"
#. module: account
#: help:account.account,unrealized_gain_loss:0
@@ -4406,7 +4467,7 @@ msgstr "Хөрөнгө"
#. module: account
#: view:account.config.settings:0
msgid "Accounting & Finance"
-msgstr ""
+msgstr "Санхүү & НББ"
#. module: account
#: view:account.invoice.confirm:0
@@ -4612,7 +4673,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,purchase_sequence_prefix:0
msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Нийлүүлэгчийн нэхэмжлэлийн дараалал"
#. module: account
#: code:addons/account/account_invoice.py:587
@@ -4628,7 +4689,7 @@ msgstr ""
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Барааны хэмжих нэгж"
#. module: account
#: field:res.company,paypal_account:0
@@ -4733,7 +4794,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
#, python-format
msgid "Last Reconciliation:"
-msgstr ""
+msgstr "Сүүлчийн тулгалт:"
#. module: account
#: selection:account.move.line,state:0
@@ -4766,7 +4827,7 @@ msgstr "Дансны мод"
#. module: account
#: field:account.invoice,reference_type:0
msgid "Payment Reference"
-msgstr ""
+msgstr "Төлбөрийн Сурвалж"
#. module: account
#: selection:account.financial.report,style_overwrite:0
@@ -4835,12 +4896,12 @@ msgstr "Орлогын тэмдэглэл"
#: view:account.move.line:0
#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Тулгагдах Журналын бичилтүүд"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
msgid "Templates for Taxes"
-msgstr ""
+msgstr "Татварийн Үлгэрүүд"
#. module: account
#: sql_constraint:account.period:0
@@ -4855,7 +4916,7 @@ msgstr ""
#. module: account
#: view:account.tax:0
msgid "Tax Computation"
-msgstr ""
+msgstr "Татвар Тооцоолох"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4901,6 +4962,10 @@ msgid ""
"You can create one in the menu: \n"
"Configuration\\Journals\\Journals."
msgstr ""
+"Энэ компанид %s төрөлтэй санхүүгийн журнал олдсонгүй.\n"
+"\n"
+"Та дараах цэсээр үүсгэж болно: \n"
+"Тохиргоо/Журнал/Журнал."
#. module: account
#: report:account.vat.declaration:0
@@ -4946,7 +5011,7 @@ msgstr "Энэ бол кредит гүйлгээний үндсэн данс"
#. module: account
#: view:cash.box.out:0
msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Энэ кассын бүртгэлээс ямар шалтгаанаар мөнгө авч байгаагаа тайлбарла"
#. module: account
#: selection:account.invoice,state:0
@@ -5011,7 +5076,7 @@ msgstr "Цуцлагдсан нэхэмжлэл"
#. module: account
#: view:account.invoice:0
msgid "My Invoices"
-msgstr ""
+msgstr "Миний нэхэмжлэлүүд"
#. module: account
#: selection:account.bank.statement,state:0
@@ -5021,7 +5086,7 @@ msgstr "Шинэ"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Sale Tax"
-msgstr ""
+msgstr "Борлуулалтын Татвар"
#. module: account
#: field:account.tax,ref_tax_code_id:0
@@ -5120,7 +5185,7 @@ msgstr "Шалгах"
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "or"
-msgstr ""
+msgstr "эсвэл"
#. module: account
#: view:account.invoice.report:0
@@ -5271,7 +5336,7 @@ msgstr "Баланс дансны төрлөөр"
#: code:addons/account/account_cash_statement.py:301
#, python-format
msgid "There is no %s Account on the journal %s."
-msgstr ""
+msgstr "%s данс %s журналд алга байна."
#. module: account
#: model:res.groups,name:account.group_account_user
@@ -5291,7 +5356,7 @@ msgstr ""
#. module: account
#: model:res.groups,name:account.group_account_manager
msgid "Financial Manager"
-msgstr ""
+msgstr "Санхүүгийн менежер"
#. module: account
#: field:account.journal,group_invoice_lines:0
@@ -5475,7 +5540,7 @@ msgstr "Жил"
#. module: account
#: help:account.invoice,sent:0
msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Энэ нь нэхэмжлэл илгээгдсэнийг илэрхийлнэ."
#. module: account
#: field:account.tax.template,description:0
@@ -5620,6 +5685,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Чаатлагчийн хураангуйг агуулна (зурвасын тоо,...). Энэ хураангуй нь шууд "
+"html форматтай бөгөөд канбан харагдацад шууд орж харагдах боломжтой."
#. module: account
#: field:account.tax,child_depend:0
@@ -5699,7 +5766,7 @@ msgstr "Суурь дүнд шингэх"
#. module: account
#: field:account.invoice,supplier_invoice_number:0
msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Нийлүүлэгчийн нэхэмжлэлийн дугаар"
#. module: account
#: help:account.payment.term.line,days:0
@@ -5816,12 +5883,12 @@ msgstr "Жилийн хаалтын бичилтийн журнал"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund "
-msgstr ""
+msgstr "Ноорог Буцаалт "
#. module: account
#: view:cash.box.in:0
msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Кассын бүртгэлд мөнгө хийж байгаа бол энэ маягтыг бөглөнө"
#. module: account
#: view:account.payment.term.line:0
@@ -5969,7 +6036,7 @@ msgstr "Санхүүгийн харгалзуулалтын загвар"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund"
-msgstr ""
+msgstr "Ноорог Буцаалт"
#. module: account
#: view:account.analytic.chart:0
@@ -6035,7 +6102,7 @@ msgstr "Журналын бичилт"
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
#: model:ir.ui.menu,name:account.menu_wizard_fy_close
msgid "Generate Opening Entries"
-msgstr "Санхүүгийн жилийн нээлтийн гүйлгээ тохируулах"
+msgstr "Нээлтийн бичилтийг үүсгэх"
#. module: account
#: help:account.tax,type:0
@@ -6142,7 +6209,7 @@ msgstr "санхүүгийн зурагжуулалт"
#. module: account
#: view:account.config.settings:0
msgid "Select Company"
-msgstr ""
+msgstr "Компани сонгох"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6216,7 +6283,7 @@ msgstr "Нэх.мөрийн тоо"
#. module: account
#: view:account.invoice:0
msgid "(update)"
-msgstr ""
+msgstr "(шинэчлэх)"
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -6432,7 +6499,7 @@ msgstr "Аналитик бичилт"
#. module: account
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Models"
-msgstr ""
+msgstr "Модел"
#. module: account
#: code:addons/account/account_invoice.py:1095
@@ -6525,7 +6592,7 @@ msgstr "Хүүхдүүдийг хавтгайгаар харуулах"
#. module: account
#: view:account.config.settings:0
msgid "Bank & Cash"
-msgstr ""
+msgstr "Банк & Касс"
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
@@ -6611,7 +6678,7 @@ msgstr "Авлага"
#. module: account
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Та хаагдсан дансанд журналын бичилт үүсгэх боломжгүй."
#. module: account
#: code:addons/account/account_invoice.py:610
@@ -6638,7 +6705,7 @@ msgstr "Холбогдох дансны валют нь компаний вал
#: code:addons/account/installer.py:48
#, python-format
msgid "Custom"
-msgstr ""
+msgstr "Өөрийн"
#. module: account
#: view:account.analytic.account:0
@@ -6659,7 +6726,7 @@ msgstr "Тэгшитгэл"
#. module: account
#: field:account.journal,internal_account_id:0
msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Дотоод Шилжүүлэлтийн Данс"
#. module: account
#: code:addons/account/wizard/pos_box.py:33
@@ -6707,7 +6774,7 @@ msgstr "Нэхэмжлэлийн дугаар"
#. module: account
#: field:account.bank.statement,difference:0
msgid "Difference"
-msgstr ""
+msgstr "Зөрүү"
#. module: account
#: help:account.tax,include_base_amount:0
@@ -6778,12 +6845,12 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
msgid "User Error!"
-msgstr ""
+msgstr "Хэрэглэгчийн алдаа!"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Discard"
-msgstr ""
+msgstr "Хэрэгсэхгүй"
#. module: account
#: selection:account.account,type:0
@@ -6897,6 +6964,8 @@ msgid ""
"There is no period defined for this date: %s.\n"
"Please create one."
msgstr ""
+"Энэ огноод: %s мөчлөг тодорхойлогдоогүй байна.\n"
+"Үүсгэнэ үү."
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -7099,13 +7168,13 @@ msgstr "Ашиг-Алдагдал (Зардлын данс)"
#. module: account
#: field:account.bank.statement,total_entry_encoding:0
msgid "Total Transactions"
-msgstr ""
+msgstr "Нийт Гүйлгээ"
#. module: account
#: code:addons/account/account.py:636
#, python-format
msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Та журналын бичилт агуулж байгаа данс хаах боломжгүй."
#. module: account
#: code:addons/account/account.py:1024
@@ -7149,13 +7218,13 @@ msgstr "Гараар"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: create refund and reconcile"
-msgstr ""
+msgstr "Цуцлах: буцаалт үүсгээд тулгах"
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
msgid "You must set a start date."
-msgstr ""
+msgstr "Та эхлэх огноог тааруулна уу."
#. module: account
#: view:account.automatic.reconcile:0
@@ -7202,7 +7271,7 @@ msgstr "Ажил гүйлгээ"
#: code:addons/account/wizard/account_invoice_refund.py:147
#, python-format
msgid "No period found on the invoice."
-msgstr ""
+msgstr "Нэхэмжлэлд мөчлөг олдсонгүй"
#. module: account
#: help:account.partner.ledger,page_split:0
@@ -7402,7 +7471,7 @@ msgstr "Захиалагчийн нэхэмжлэл"
#. module: account
#: view:account.tax:0
msgid "Misc"
-msgstr ""
+msgstr "Бусад"
#. module: account
#: view:account.analytic.line:0
@@ -7474,7 +7543,7 @@ msgstr "Санхүүгийн Тайлан"
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account Currency"
-msgstr ""
+msgstr "Дансны валют"
#. module: account
#: report:account.invoice:0
@@ -7539,7 +7608,7 @@ msgstr "Нээлтийн Бичилтүүдийн Зардлын Дансдуу
#. module: account
#: view:account.invoice:0
msgid "Customer Reference"
-msgstr ""
+msgstr "Үйлчлүүлэгчийн дугаар"
#. module: account
#: field:account.account.template,parent_id:0
@@ -7596,7 +7665,7 @@ msgstr "Нэхэмжилсэн Огнооны Жилээр нь Бүлэглэх
#. module: account
#: field:account.config.settings,purchase_tax_rate:0
msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Худалдан авалтын Татвар (%)"
#. module: account
#: help:res.partner,credit:0
@@ -7611,7 +7680,7 @@ msgstr "Баланс бариагүй журналын бичилт"
#. module: account
#: model:ir.actions.act_window,name:account.open_account_charts_modules
msgid "Chart Templates"
-msgstr ""
+msgstr "Загвар дансны мод"
#. module: account
#: field:account.journal.period,icon:0
@@ -7703,7 +7772,7 @@ msgstr ""
#. module: account
#: help:account.config.settings,currency_id:0
msgid "Main currency of the company."
-msgstr ""
+msgstr "Компаний үндсэн валют."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reports
@@ -8033,7 +8102,7 @@ msgstr ""
#. module: account
#: field:account.move.line,amount_residual_currency:0
msgid "Residual Amount in Currency"
-msgstr ""
+msgstr "Валютын зөрөө дүн"
#. module: account
#: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8104,7 +8173,7 @@ msgstr "Дараалал"
#. module: account
#: field:account.config.settings,paypal_account:0
msgid "Paypal account"
-msgstr ""
+msgstr "Paypal данс"
#. module: account
#: selection:account.print.journal,sort_selection:0
@@ -8123,6 +8192,8 @@ msgid ""
"Error!\n"
"You cannot create recursive accounts."
msgstr ""
+"Алдаа!\n"
+"Тойрог хамааралтай данс үүсгэх боломжгүй."
#. module: account
#: model:ir.model,name:account.model_cash_box_in
@@ -8160,7 +8231,7 @@ msgstr "Тооцоолсон Баланс"
#: code:addons/account/static/src/js/account_move_reconciliation.js:89
#, python-format
msgid "You must choose at least one record."
-msgstr ""
+msgstr "Дор хаяж нэг бичлэг сонгох ёстой"
#. module: account
#: field:account.account,parent_id:0
@@ -8172,7 +8243,7 @@ msgstr "Эцэг"
#: code:addons/account/account_cash_statement.py:292
#, python-format
msgid "Profit"
-msgstr ""
+msgstr "Ашиг"
#. module: account
#: help:account.payment.term.line,days2:0
@@ -8248,6 +8319,7 @@ msgstr "Анхааруулга !"
#: help:account.invoice,message_unread:0
msgid "If checked new messages require your attention."
msgstr ""
+"Хэрэв тэмдэглэгдсэн бол таныг шинэ зурвасуудад анхаарал хандуулахыг шаардана."
#. module: account
#: field:res.company,tax_calculation_rounding_method:0
@@ -8446,7 +8518,7 @@ msgstr "Өртөгийн тайлан"
#. module: account
#: view:account.config.settings:0
msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Энэ компанид Санхүүгийн жил тодорхойлогдоогүй байна"
#. module: account
#: view:account.invoice:0
@@ -8477,7 +8549,7 @@ msgstr "Худалдан авалтын буцаалтын журнал"
#: code:addons/account/account.py:1297
#, python-format
msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Энэ журналд дараалaл тодорхойлон уу."
#. module: account
#: help:account.tax.template,amount:0
@@ -8551,12 +8623,12 @@ msgstr "Цэвэр нийлбэр:"
#: code:addons/account/wizard/account_report_common.py:158
#, python-format
msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Эхлэл ба төгсгөлийн мөчлөгийг сонгоно уу."
#. module: account
#: field:account.config.settings,sale_sequence_next:0
msgid "Next invoice number"
-msgstr ""
+msgstr "Дараагийн нэхэмжлэлийн дугаар"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -8650,7 +8722,7 @@ msgstr "Төгсгөлийн баланс"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralized Counterpart"
-msgstr ""
+msgstr "Төвлөрсөн эсрэг тал"
#. module: account
#: help:account.move.line,blocked:0
@@ -8697,7 +8769,7 @@ msgstr "Банкны хуулгыг автоматаар импортлох"
#: code:addons/account/account_invoice.py:389
#, python-format
msgid "Unknown Error!"
-msgstr ""
+msgstr "Үл мэдэх Алдаа!"
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -8707,7 +8779,7 @@ msgstr "Банкны тулгалтыг зөөх"
#. module: account
#: view:account.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Ашиглах"
#. module: account
#: field:account.financial.report,account_type_ids:0
@@ -8719,7 +8791,7 @@ msgstr "Дансны төрөл"
#. module: account
#: model:email.template,subject:account.email_template_edi_invoice
msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} Нэхэмжлэл (Ref ${object.number or 'n/a'})"
#. module: account
#: code:addons/account/account_move_line.py:1211
@@ -8971,7 +9043,7 @@ msgstr "Зөвшөөрөгдсөн дансууд (хоосон орхивол
#. module: account
#: field:account.config.settings,sale_tax_rate:0
msgid "Sales tax (%)"
-msgstr ""
+msgstr "Борлуулалтын Татвар (%)"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -9144,7 +9216,7 @@ msgstr "Буруу модел !"
#: view:account.tax.code.template:0
#: view:account.tax.template:0
msgid "Tax Template"
-msgstr ""
+msgstr "Татварын загвар"
#. module: account
#: field:account.invoice.refund,period:0
@@ -9210,7 +9282,7 @@ msgstr "Ноорог нэхэмжлэл хянагдаж батлагдсан б
#: field:account.bank.statement,message_is_follower:0
#: field:account.invoice,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Дагагч эсэх"
#. module: account
#: view:account.move:0
@@ -9230,7 +9302,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,has_fiscal_year:0
msgid "Company has a fiscal year"
-msgstr ""
+msgstr "Компани нь Санхүүгийн жилтэй байна"
#. module: account
#: help:account.tax,child_depend:0
@@ -9246,7 +9318,7 @@ msgstr ""
#: code:addons/account/account.py:634
#, python-format
msgid "You cannot deactivate an account that contains journal items."
-msgstr ""
+msgstr "Та журналын бичилт агуулж байгаа данс идэвхгүй болгох боломжгүй."
#. module: account
#: selection:account.tax,applicable_type:0
@@ -9290,7 +9362,7 @@ msgstr "Эхлэл мөчлөг"
#. module: account
#: field:account.cashbox.line,pieces:0
msgid "Unit of Currency"
-msgstr ""
+msgstr "Валютын Нэгж"
#. module: account
#: code:addons/account/account.py:3147
@@ -9327,7 +9399,7 @@ msgstr "Санхүүгийн жил болон мөчлөгийн төлвийг
#. module: account
#: field:account.config.settings,purchase_refund_journal_id:0
msgid "Purchase refund journal"
-msgstr ""
+msgstr "Худалдан авалтын буцаалтын журнал"
#. module: account
#: view:account.analytic.line:0
@@ -9351,7 +9423,7 @@ msgstr "Нэхэмжлэл үүсгэх"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
msgid "Configure Accounting Data"
-msgstr ""
+msgstr "Санхүүгийн Өгөгдөл Тохируулах"
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
@@ -9478,7 +9550,7 @@ msgstr "Харилцагчаас компани хамаарах"
#. module: account
#: view:account.invoice:0
msgid "Ask Refund"
-msgstr ""
+msgstr "Буцаалт Шаардах"
#. module: account
#: view:account.move.line:0
@@ -9508,13 +9580,13 @@ msgstr "Авлагын данс"
#. module: account
#: field:account.config.settings,purchase_refund_sequence_prefix:0
msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Нийлүүлэгчийн кредит дугаарын дараалал"
#. module: account
#: code:addons/account/wizard/account_state_open.py:37
#, python-format
msgid "Invoice is already reconciled."
-msgstr ""
+msgstr "Нэхэмжлэл тулгагдсан байна"
#. module: account
#: help:account.config.settings,module_account_payment:0
@@ -9646,12 +9718,12 @@ msgstr "Ажил гүйлгээ"
#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Буруу Үйлдэл!"
#. module: account
#: view:account.bank.statement:0
msgid "Date / Period"
-msgstr ""
+msgstr "Огноо / Мөчлөг"
#. module: account
#: report:account.central.journal:0
@@ -9692,7 +9764,7 @@ msgstr "Сонгосон үлгэрээр энэ байгаа эцэгийн д
#. module: account
#: report:account.invoice:0
msgid "Source"
-msgstr ""
+msgstr "Эх үүсвэр"
#. module: account
#: selection:account.model.line,date_maturity:0
@@ -9719,7 +9791,7 @@ msgstr ""
#. module: account
#: field:account.invoice,sent:0
msgid "Sent"
-msgstr ""
+msgstr "Илгээгдсэн"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -9730,7 +9802,7 @@ msgstr "Нийтлэг тайлан"
#: field:account.config.settings,default_sale_tax:0
#: field:account.config.settings,sale_tax:0
msgid "Default sale tax"
-msgstr ""
+msgstr "Үндсэн борлуулалтын татвар"
#. module: account
#: report:account.overdue:0
@@ -9741,7 +9813,7 @@ msgstr "Үлдэгдэл"
#: code:addons/account/account.py:1547
#, python-format
msgid "Cannot create moves for different companies."
-msgstr ""
+msgstr "Өөр компаниудад хөдөлгөөн хийх боломжгүй"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -9826,13 +9898,13 @@ msgstr "Эцсийн огноо"
#: model:account.payment.term,name:account.account_payment_term_immediate
#: model:account.payment.term,note:account.account_payment_term_immediate
msgid "Immediate Payment"
-msgstr ""
+msgstr "Шууд Төлбөр"
#. module: account
#: code:addons/account/account.py:1464
#, python-format
msgid " Centralisation"
-msgstr ""
+msgstr " Төвлөрөл"
#. module: account
#: help:account.journal,type:0
@@ -9915,7 +9987,7 @@ msgstr "Ноорог нэхэмжлэлүүд"
#: view:cash.box.in:0
#: model:ir.actions.act_window,name:account.action_cash_box_in
msgid "Put Money In"
-msgstr ""
+msgstr "Мөнгө дотогш хийх"
#. module: account
#: selection:account.account.type,close_method:0
@@ -9973,7 +10045,7 @@ msgstr "Шинжилгээний Дансдаас"
#. module: account
#: view:account.installer:0
msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Санхүүгийн жилээ тохируулах"
#. module: account
#: field:account.period,name:0
@@ -9987,6 +10059,8 @@ msgid ""
"Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state."
msgstr ""
+"Сонгогдсон нэхэмжлэл(үүд) цуцлах боломжгүй, учир нь 'Цуцлагдсан' эсвэл "
+"'Xийгдсэн' төлөвт байна"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -10047,7 +10121,7 @@ msgstr "Энэ бол тухайн харилцагчийн өглөгийн б
#. module: account
#: field:account.period,special:0
msgid "Opening/Closing Period"
-msgstr "Мөчлөг нээж хаах"
+msgstr "Нээлт/Хаалтын мөчлөг"
#. module: account
#: field:account.account,currency_id:0
@@ -10088,7 +10162,7 @@ msgstr "Кредит"
#. module: account
#: view:account.invoice:0
msgid "Draft Invoice "
-msgstr ""
+msgstr "Ноорог нэхэмжлэл "
#. module: account
#: model:ir.ui.menu,name:account.menu_account_general_journal
@@ -10189,7 +10263,7 @@ msgstr "Ашиг (Алдагдалт) тайланд"
#: code:addons/account/account_invoice.py:387
#, python-format
msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Борлуулалт/Худалдан Авалтын Журнал(ууд) тодорхойлогдоогүй байна."
#. module: account
#: view:account.move.line.reconcile.select:0
@@ -10394,7 +10468,7 @@ msgstr ""
#. module: account
#: field:account.tax,account_analytic_paid_id:0
msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Буцаалтын Татварын Шинжилгээний Данс"
#. module: account
#: view:account.move.bank.reconcile:0
@@ -10461,7 +10535,7 @@ msgstr "Гүйцээгдэх огноо"
#: field:cash.box.in,name:0
#: field:cash.box.out,name:0
msgid "Reason"
-msgstr ""
+msgstr "Шалтгаан"
#. module: account
#: selection:account.partner.ledger,filter:0
@@ -10523,7 +10597,7 @@ msgstr ""
#: code:addons/account/account_move_line.py:1059
#, python-format
msgid "Unable to change tax!"
-msgstr ""
+msgstr "Татварыг солих боломжгүй!"
#. module: account
#: constraint:account.bank.statement:0
@@ -10557,7 +10631,7 @@ msgstr ""
#. module: account
#: view:account.partner.reconcile.process:0
msgid "Go to Next Partner"
-msgstr ""
+msgstr "Дараачийн харилцагч руу шилжих."
#. module: account
#: view:account.automatic.reconcile:0
@@ -10649,7 +10723,7 @@ msgstr "Авлагын данс"
#: code:addons/account/account_move_line.py:783
#, python-format
msgid "Already reconciled."
-msgstr ""
+msgstr "Тулгагдсан байна"
#. module: account
#: selection:account.model.line,date_maturity:0
@@ -10722,7 +10796,7 @@ msgstr "Нэхэмжлэлийн огнооны сараар нь бүлэглэ
#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Дараах бараанд Орлогын данс тодорхойлогдоогүй байна: \"%s\"(id:%d)."
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -10842,7 +10916,7 @@ msgstr "Сонгосон барааны орлогын эсвэл зарлагы
#. module: account
#: view:account.config.settings:0
msgid "Install more chart templates"
-msgstr ""
+msgstr "Нэмэлт модны үлгэр суулгах"
#. module: account
#: report:account.general.journal:0
@@ -10901,6 +10975,7 @@ msgstr "Журналын бичилт батлах"
msgid ""
"The fiscal position will determine taxes and accounts used for the partner."
msgstr ""
+"Санхүүгийн харгалзаа нь харилцагчид хэрэглэгдэх татвар, дансыг тодорхойлдог."
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -10916,7 +10991,7 @@ msgstr "Тулгалт хийгдмэгц нэхэмжлэл төлөгдөх б
#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not configured properly."
-msgstr ""
+msgstr "Шинэ валютын тохиргоо зөв хийгдээгүй байна."
#. module: account
#: view:account.account.template:0
@@ -10945,7 +11020,7 @@ msgstr "Баруун Эцэг"
#: code:addons/account/static/src/js/account_move_reconciliation.js:80
#, python-format
msgid "Never"
-msgstr ""
+msgstr "Хэзээч"
#. module: account
#: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -10966,7 +11041,7 @@ msgstr "Харилцагчийн"
#. module: account
#: field:account.account,note:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Дотоод тэмдэглэл"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -10999,7 +11074,7 @@ msgstr "Дансны модел"
#: code:addons/account/account_cash_statement.py:292
#, python-format
msgid "Loss"
-msgstr ""
+msgstr "Алдагдал"
#. module: account
#: selection:account.entries.report,month:0
@@ -11073,7 +11148,7 @@ msgstr "Барааны загвар дээрх зарлагын данс"
#. module: account
#: field:res.partner,property_payment_term:0
msgid "Customer Payment Term"
-msgstr ""
+msgstr "Захаиалагчийн Төлбөрийн нөхцөл"
#. module: account
#: help:accounting.report,label_filter:0
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 1a596a4a7a9..8590ee286d4 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -12,9 +12,9 @@
-
+
-
+
@@ -30,15 +30,18 @@
-
-
+
+
+
-
-
-
+
+
+
+
+
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index ed3649c300a..dad70f695dc 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -58,6 +58,7 @@
+
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index f72e81fbc08..21c1ee3d846 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -35,10 +35,7 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
'lines': self.lines,
'sum_debit_partner': self._sum_debit_partner,
'sum_credit_partner': self._sum_credit_partner,
-# 'sum_debit': self._sum_debit,
-# 'sum_credit': self._sum_credit,
'get_currency': self._get_currency,
- 'comma_me': self.comma_me,
'get_start_period': self.get_start_period,
'get_end_period': self.get_end_period,
'get_account': self._get_account,
@@ -78,11 +75,6 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
-
- if (data['model'] == 'res.partner'):
- ## Si on imprime depuis les partenaires
- if ids:
- PARTNER_REQUEST = "AND line.partner_id IN %s",(tuple(ids),)
if self.result_selection == 'supplier':
self.ACCOUNT_TYPE = ['payable']
elif self.result_selection == 'customer':
@@ -98,7 +90,11 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
'WHERE a.type IN %s' \
"AND a.active", (tuple(self.ACCOUNT_TYPE), ))
self.account_ids = [a for (a,) in self.cr.fetchall()]
- partner_to_use = []
+ params = [tuple(move_state), tuple(self.account_ids)]
+ #if we print from the partners, add a clause on active_ids
+ if (data['model'] == 'res.partner') and ids:
+ PARTNER_REQUEST = "AND l.partner_id IN %s"
+ params += [tuple(ids)]
self.cr.execute(
"SELECT DISTINCT l.partner_id " \
"FROM account_move_line AS l, account_account AS account, " \
@@ -110,30 +106,10 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
# "AND " + self.query +" " \
"AND l.account_id IN %s " \
" " + PARTNER_REQUEST + " " \
- "AND account.active ",
- (tuple(move_state), tuple(self.account_ids),))
-
- res = self.cr.dictfetchall()
- for res_line in res:
- partner_to_use.append(res_line['partner_id'])
- new_ids = partner_to_use
- self.partner_ids = new_ids
- objects = obj_partner.browse(self.cr, self.uid, new_ids)
- return super(third_party_ledger, self).set_context(objects, data, new_ids, report_type)
-
- def comma_me(self, amount):
- if type(amount) is float:
- amount = str('%.2f'%amount)
- else:
- amount = str(amount)
- if (amount == '0'):
- return ' '
- orig = amount
- new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
- if orig == new:
- return new
- else:
- return self.comma_me(new)
+ "AND account.active ", params)
+ self.partner_ids = [res['partner_id'] for res in self.cr.dictfetchall()]
+ objects = obj_partner.browse(self.cr, self.uid, self.partner_ids)
+ return super(third_party_ledger, self).set_context(objects, data, self.partner_ids, report_type)
def lines(self, partner):
move_state = ['draft','posted']
@@ -290,105 +266,6 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
result_tmp = result_tmp + 0.0
return result_tmp + result_init
- # code is deprecated
-# def _sum_debit(self):
-# move_state = ['draft','posted']
-# if self.target_move == 'posted':
-# move_state = ['posted']
-#
-# if not self.ids:
-# return 0.0
-# result_tmp = 0.0
-# result_init = 0.0
-# if self.reconcil:
-# RECONCILE_TAG = " "
-# else:
-# RECONCILE_TAG = "AND reconcile_id IS NULL"
-# if self.initial_balance:
-# self.cr.execute(
-# "SELECT sum(debit) " \
-# "FROM account_move_line AS l, " \
-# "account_move AS m "
-# "WHERE partner_id IN %s" \
-# "AND m.id = l.move_id " \
-# "AND m.state IN %s "
-# "AND account_id IN %s" \
-# "AND reconcile_id IS NULL " \
-# "AND " + self.init_query + " ",
-# (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
-# contemp = self.cr.fetchone()
-# if contemp != None:
-# result_init = contemp[0] or 0.0
-# else:
-# result_init = result_tmp + 0.0
-#
-# self.cr.execute(
-# "SELECT sum(debit) " \
-# "FROM account_move_line AS l, " \
-# "account_move AS m "
-# "WHERE partner_id IN %s" \
-# "AND m.id = l.move_id " \
-# "AND m.state IN %s "
-# "AND account_id IN %s" \
-# " " + RECONCILE_TAG + " " \
-# "AND " + self.query + " ",
-# (tuple(self.partner_ids), tuple(move_state) ,tuple(self.account_ids),))
-# contemp = self.cr.fetchone()
-# if contemp != None:
-# result_tmp = contemp[0] or 0.0
-# else:
-# result_tmp = result_tmp + 0.0
-# return result_tmp + result_init
-#
-# def _sum_credit(self):
-# move_state = ['draft','posted']
-# if self.target_move == 'posted':
-# move_state = ['posted']
-#
-# if not self.ids:
-# return 0.0
-# result_tmp = 0.0
-# result_init = 0.0
-# if self.reconcil:
-# RECONCILE_TAG = " "
-# else:
-# RECONCILE_TAG = "AND reconcile_id IS NULL"
-# if self.initial_balance:
-# self.cr.execute(
-# "SELECT sum(credit) " \
-# "FROM account_move_line AS l, " \
-# "account_move AS m "
-# "WHERE partner_id IN %s" \
-# "AND m.id = l.move_id " \
-# "AND m.state IN %s "
-# "AND account_id IN %s" \
-# "AND reconcile_id IS NULL " \
-# "AND " + self.init_query + " ",
-# (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids)))
-# contemp = self.cr.fetchone()
-# if contemp != None:
-# result_init = contemp[0] or 0.0
-# else:
-# result_init = result_tmp + 0.0
-#
-# self.cr.execute(
-# "SELECT sum(credit) " \
-# "FROM account_move_line AS l, " \
-# "account_move AS m "
-# "WHERE partner_id IN %s" \
-# "AND m.id = l.move_id " \
-# "AND m.state IN %s "
-# "AND account_id IN %s" \
-# " " + RECONCILE_TAG + " " \
-# "AND " + self.query + " ",
-# (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids),))
-# contemp = self.cr.fetchone()
-# if contemp != None:
-# result_tmp = contemp[0] or 0.0
-# else:
-# result_tmp = result_tmp + 0.0
-# return result_tmp + result_init
-
def _get_partners(self):
if self.result_selection == 'customer':
return 'Receivable Accounts'
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 7fe3095d47f..0064a1d2556 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -13,7 +13,8 @@
In order to test the PDF reports defined on an invoice, we will print an Invoice Report
-
!python {model: account.invoice}: |
- import netsvc, tools, os
+ import os
+ from openerp import netsvc, tools
(data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.account_invoice_customer0')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data)
@@ -22,7 +23,8 @@
In order to test the PDF reports defined on a partner, we will print the Overdue Report
-
!python {model: res.partner}: |
- import netsvc, tools, os
+ import os
+ from openerp import netsvc, tools
(data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_1'),ref('base.res_partner_2'),ref('base.res_partner_12')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
@@ -32,7 +34,7 @@
!python {model: account.account}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0')}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Account Balance Sheet in Normal mode
@@ -40,7 +42,7 @@
!python {model: account.account}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0'), 'account_report_id': ref('account_financial_report_balancesheet0')}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Account Balance Report in Normal mode through the wizard - From Account Chart
@@ -48,7 +50,7 @@
!python {model: account.account}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0')}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_balance_menu',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Central Journal Report - From Account
@@ -58,7 +60,7 @@
ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
ctx={}
data_dict = {'chart_account_id':ref('account.chart0')}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_central_journal',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the General Journal Report - From Journal
@@ -68,7 +70,7 @@
ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
ctx={}
data_dict = {'chart_account_id':ref('account.chart0')}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_general_journal',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the General Ledger Report in Normal Mode
@@ -76,7 +78,7 @@
!python {model: account.account}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0'),'landscape':False}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_general_ledger_menu',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the General Ledger Report in Landscape Mode
@@ -84,7 +86,7 @@
!python {model: account.account}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0'),'landscape':True}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_general_ledger_menu',wiz_data=data_dict, context=ctx, our_module='account')
-
Print Journal Report - From Model
@@ -93,7 +95,7 @@
journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
ctx={}
data_dict = {'chart_account_id':ref('account.chart0'), 'period_from':ref('period_1'), 'period_to':ref('period_12')}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_print_journal',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Partner Balance Report
@@ -101,7 +103,7 @@
!python {model: account.account}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0')}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_partner_balance',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Partner Ledger Report
@@ -109,7 +111,7 @@
!python {model: account.account}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0'),'page_split': True}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_partner_ledger',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Partner Ledger-Other Report
@@ -117,7 +119,7 @@
!python {model: res.partner}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0'),'page_split': False}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_partner_ledger',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Profit-Loss Report in Normal Mode
@@ -125,7 +127,7 @@
!python {model: account.account}: |
ctx={}
data_dict = {'chart_account_id':ref('account.chart0'), 'target_move': 'all', 'account_report_id': ref('account_financial_report_balancesheet0')}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Analytic Balance Report through the wizard
@@ -134,7 +136,7 @@
ctx={}
ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
data_dict = {}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_analytic_balance',wiz_data=data_dict, context=ctx, our_module='account')
-
@@ -144,7 +146,7 @@
ctx={}
ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root'),ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_our_super_product')]})
data_dict = {}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_analytic_cost',wiz_data=data_dict, context=ctx, our_module='account')
-
@@ -154,7 +156,7 @@
ctx={}
ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root'),ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_our_super_product')]})
data_dict = {}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_analytic_cost_ledger_journal',wiz_data=data_dict, context=ctx, our_module='account')
-
@@ -164,7 +166,7 @@
ctx={}
ctx.update({'model': 'account.analytic.journal','active_ids': [ref('account.cose_journal_sale'), ref('account.exp'), ref('account.sit')]})
data_dict = {}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_analytic_journal',wiz_data=data_dict, context=ctx, our_module='account')
-
@@ -174,5 +176,5 @@
ctx={}
ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
data_dict = {}
- from tools import test_reports
+ from openerp.tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index f3dd9a80f09..34c5d55e4c1 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -23,7 +23,7 @@
- Select Period
+ Partner Ledger
account.partner.ledger
ir.actions.act_window
form
@@ -33,6 +33,13 @@
new
+
+
+
+ Print Partner Ledger
+
+
+