diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 0ef2a560878..8f7225d973c 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-19 14:39+0000\n" +"PO-Revision-Date: 2010-10-20 07:22+0000\n" "Last-Translator: Lorenzo Battistini \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n" +"X-Launchpad-Export-Date: 2010-10-21 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 71316b3567a..d8f3772f7d4 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: 2010-10-18 06:38+0000\n" -"Last-Translator: sugi \n" +"PO-Revision-Date: 2010-10-21 03:35+0000\n" +"Last-Translator: Jacara \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-10-20 04:55+0000\n" +"X-Launchpad-Export-Date: 2010-10-21 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -46,7 +46,7 @@ msgstr "Хугацаа хожимдсон төлбөрийн тайлангий #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement from draft" -msgstr "Ноорогноос тайлан батлах." +msgstr "Ноорог гүйлгээг батлах" #. module: account #: model:account.account.type,name:account.account_type_asset @@ -85,12 +85,12 @@ msgstr "Хоосон орхивол батлагдсан огноон мөчлө #. module: account #: wizard_view:account.automatic.reconcile,reconcile:0 msgid "Reconciliation result" -msgstr "Тулгалтын үр дүн" +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 @@ -108,7 +108,7 @@ msgstr "Дансны статистик" #: 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 @@ -118,7 +118,7 @@ msgstr "Эцэг" #. module: account #: selection:account.move,type:0 msgid "Journal Voucher" -msgstr "Журналын хувьцаа" +msgstr "Журналын ваучер" #. module: account #: field:account.invoice,residual:0 @@ -137,7 +137,7 @@ msgstr "Үндсэн тэмдэг" #: model:ir.actions.wizard,name:account.wizard_unreconcile_select #: model:ir.ui.menu,name:account.menu_unreconcile_select msgid "Unreconcile entries" -msgstr "Гүйцэлтгэлийг цуцлах" +msgstr "Гүйцээгдээгүй бичилтүүд" #. module: account #: constraint:account.period:0 @@ -162,7 +162,7 @@ msgstr "Орлогын төвлөрөл" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm msgid "Confirm draft invoices" -msgstr "Ноорог нэхэмжлэл бататгах" +msgstr "Ноорог нэхэмжлэл батлах" #. module: account #: help:account.payment.term.line,days2:0 @@ -188,7 +188,7 @@ msgstr "Дансны мод" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select msgid "Move line select" -msgstr "Гүйлгээний дараалал сонгох" +msgstr "Журналын бичилт сонгох" #. module: account #: rml:account.journal.period.print:0 @@ -201,7 +201,7 @@ msgstr "Гүйлгээний нэр" #. module: account #: model:ir.model,name:account.model_account_model_line msgid "Account Model Entries" -msgstr "Дансны загвар гүйлгээ" +msgstr "Загвар ажил гүйлгээ" #. module: account #: field:account.tax.code,sum_period:0 @@ -223,7 +223,7 @@ msgstr "Дансны бичилт" #. module: account #: wizard_view:account.aged.trial.balance,init:0 msgid "Aged Trial Balance" -msgstr "Хуучин шалгах баланс" +msgstr "Урьдчилсан баланс" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries @@ -296,7 +296,7 @@ msgstr "" #: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "Fixed" -msgstr "Тогтмол утга" +msgstr "Тогтмол" #. module: account #: model:ir.actions.report.xml,name:account.account_overdue @@ -319,7 +319,7 @@ msgstr "Мөчлөг сонгох" #: field:account.invoice,origin:0 #: field:account.invoice.line,origin:0 msgid "Origin" -msgstr "Эх үүсвэр" +msgstr "Эх сурвалж" #. module: account #: rml:account.analytic.account.journal:0 @@ -466,7 +466,7 @@ msgstr "Тусгай тооцоололт" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement with/without reconciliation from draft statement" -msgstr "Ноорог баримтыг гүйцэлтгэлтэй болон гүйцэлтгэлгүйгээр батлах." +msgstr "Ноорог гүйлгээг гүйцээлттэй/гүйцээлтгүй байдлаар батлах" #. module: account #: wizard_view:account.move.bank.reconcile,init:0 @@ -4722,7 +4722,7 @@ msgstr "" #. module: account #: model:process.node,name:account.process_node_draftstatement0 msgid "Draft statement" -msgstr "Банкны ноорог хуулга" +msgstr "Ноорог гүйлгээ" #. module: account #: field:account.analytic.journal,name:0 @@ -4825,7 +4825,7 @@ msgstr "Цуцлагдсан" #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree msgid "Draft statements" -msgstr "Банкны ноорог хуулгууд" +msgstr "Ноорог гүйлгээнүүд" #. module: account #: wizard_field:populate_statement_from_inv,init,date:0 @@ -5265,7 +5265,7 @@ msgstr "Солих татвар" #. module: account #: model:process.transition,note:account.process_transition_invoicemanually0 msgid "Encode manually statement comes into the draft statement" -msgstr "" +msgstr "Гараар оруулсан гүйлгээнүүд ноорог хэлбэрээр үүснэ" #. module: account #: model:ir.ui.menu,name:account.next_id_43 diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index e0cb5d6076e..e23eb971e42 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-18 09:52+0000\n" +"PO-Revision-Date: 2010-10-20 07:18+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n" +"X-Launchpad-Export-Date: 2010-10-21 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/invoice.py b/addons/account/invoice.py index ab9b90d7361..dbac0fdd745 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -830,7 +830,7 @@ class account_invoice(osv.osv): total_fixed += line.value_amount if line.value == 'procent': total_percent += line.value_amount - total_fixed = (total_fixed * 100) / inv.amount_total + total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0) if (total_fixed + total_percent) > 100: raise osv.except_osv(_('Error !'), _("Cannot create the invoice !\nThe payment term defined gives a computed amount greater than the total invoiced amount.")) diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 2f793b77d67..4ab6201b507 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -79,9 +79,9 @@ class account_fiscalyear_close(osv.osv_memory): if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id: raise osv.except_osv(_('UserError'), _('The journal must have default credit and debit account')) - if not new_journal.centralisation: + if (not new_journal.centralisation) or new_journal.entry_posted: raise osv.except_osv(_('UserError'), - _('The journal must have centralised counterpart')) + _('The journal must have centralised counterpart without the Skipping draft state option checked!')) move_ids = obj_acc_move_line.search(cr, uid, [ ('journal_id', '=', new_journal.id), ('period_id.fiscalyear_id', '=', new_fyear.id)]) diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml index 352d23d6b53..d4184dd9c8b 100644 --- a/addons/account/wizard/account_validate_move_view.xml +++ b/addons/account/wizard/account_validate_move_view.xml @@ -10,7 +10,7 @@
-