diff --git a/addons/account/account.py b/addons/account/account.py
index 3c7c14737c1..031a803d64c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -3414,6 +3414,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
all the provided information to create the accounts, the banks, the journals, the taxes, the tax codes, the
accounting properties... accordingly for the chosen company.
'''
+ if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager'):
+ raise openerp.exceptions.AccessError(_("Only administrators can change the settings"))
obj_data = self.pool.get('ir.model.data')
ir_values_obj = self.pool.get('ir.values')
obj_wizard = self.browse(cr, uid, ids[0])
@@ -3430,7 +3432,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
self.pool[tmp2[0]].write(cr, uid, tmp2[1], {
'currency_id': obj_wizard.currency_id.id
})
- except ValueError, e:
+ except ValueError:
pass
# If the floats for sale/purchase rates have been filled, create templates from them
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index ed8fb8185e7..d5c453ee9c7 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -26,7 +26,7 @@ from operator import itemgetter
from lxml import etree
-from openerp import netsvc
+from openerp import workflow
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
@@ -932,11 +932,10 @@ class account_move_line(osv.osv):
'line_id': map(lambda x: (4, x, False), ids),
'line_partial_ids': map(lambda x: (3, x, False), ids)
})
- wf_service = netsvc.LocalService("workflow")
# the id of the move.reconcile is written in the move.line (self) by the create method above
# because of the way the line_id are defined: (4, x, False)
for id in ids:
- wf_service.trg_trigger(uid, 'account.move.line', id, cr)
+ workflow.trg_trigger(uid, 'account.move.line', id, cr)
if lines and lines[0]:
partner_id = lines[0].partner_id and lines[0].partner_id.id or False
diff --git a/addons/account/i18n/am.po b/addons/account/i18n/am.po
new file mode 100644
index 00000000000..4544b53b1df
--- /dev/null
+++ b/addons/account/i18n/am.po
@@ -0,0 +1,10849 @@
+# Amharic translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR \n"
+" Click to add a fiscal period.\n"
+" \n"
+" An accounting period typically is a month or a quarter. It\n"
+" usually corresponds to the periods of the tax declaration.\n"
+" \n"
+" Click to create a customer refund. \n"
+" \n"
+" A refund is a document that credits an invoice completely "
+"or\n"
+" partially.\n"
+" \n"
+" Instead of manually creating a customer refund, you\n"
+" can generate it directly from the related customer invoice.\n"
+" \n"
+" No journal items found.\n"
+" \n"
+" Click to add an account.\n"
+" \n"
+" When doing multi-currency transactions, you may loose or "
+"gain\n"
+" some amount due to changes of exchange rate. This menu "
+"gives\n"
+" you a forecast of the Gain or Loss you'd realized if those\n"
+" transactions were ended today. Only for accounts having a\n"
+" secondary currency set.\n"
+" \n"
+" Click to create a new cash log.\n"
+" \n"
+" A Cash Register allows you to manage cash entries in your "
+"cash\n"
+" journals. This feature provides an easy way to follow up "
+"cash\n"
+" payments on a daily basis. You can enter the coins that are "
+"in\n"
+" your cash box, and then post entries when money comes in or\n"
+" goes out of the cash box.\n"
+" \n"
+" Click to define a new account type.\n"
+" \n"
+" An account type is used to determine how an account is used "
+"in\n"
+" each journal. The deferral method of an account type "
+"determines\n"
+" the process for the annual closing. Reports such as the "
+"Balance\n"
+" Sheet and the Profit and Loss report use the category\n"
+" (profit/loss or balance sheet).\n"
+" \n"
+" Click to record a new supplier invoice.\n"
+" \n"
+" You can control the invoice from your supplier according to\n"
+" what you purchased or received. OpenERP can also generate\n"
+" draft invoices automatically from purchase orders or "
+"receipts.\n"
+" \n"
+" Click to register a bank statement.\n"
+" \n"
+" A bank statement is a summary of all financial transactions\n"
+" occurring over a given period of time on a bank account. "
+"You\n"
+" should receive this periodicaly from your bank.\n"
+" \n"
+" OpenERP allows you to reconcile a statement line directly "
+"with\n"
+" the related sale or puchase invoices.\n"
+" \n"
+" Click to create a journal entry.\n"
+" \n"
+" A journal entry consists of several journal items, each of\n"
+" which is either a debit or a credit transaction.\n"
+" \n"
+" OpenERP automatically creates one journal entry per "
+"accounting\n"
+" document: invoice, refund, supplier payment, bank "
+"statements,\n"
+" etc. So, you should record journal entries manually "
+"only/mainly\n"
+" for miscellaneous operations.\n"
+" \n"
+" Click to start a new fiscal year.\n"
+" \n"
+" Define your company's financial year according to your "
+"needs. A\n"
+" financial year is a period at the end of which a company's\n"
+" accounts are made up (usually 12 months). The financial year "
+"is\n"
+" usually referred to by the date in which it ends. For "
+"example,\n"
+" if a company's financial year ends November 30, 2011, then\n"
+" everything between December 1, 2010 and November 30, 2011\n"
+" would be referred to as FY 2011.\n"
+" Hello ${object.partner_id.name}, A new invoice is available for you: \n"
+" REFERENCES It is also possible to directly pay with Paypal: If you have any question, do not hesitate to contact us. Thank you for choosing ${object.company_id.name or 'us'}! \n"
+" Click to create a customer invoice.\n"
+" \n"
+" OpenERP's electronic invoicing allows to ease and fasten "
+"the\n"
+" collection of customer payments. Your customer receives the\n"
+" invoice by email and he can pay online and/or import it\n"
+" in his own system.\n"
+" \n"
+" The discussions with your customer are automatically "
+"displayed at\n"
+" the bottom of each invoice.\n"
+" \n"
+" Click to setup a new bank account. \n"
+" \n"
+" Configure your company's bank account and select those that "
+"must\n"
+" appear on the report footer.\n"
+" \n"
+" If you use the accounting application of OpenERP, journals and\n"
+" accounts will be created automatically based on these data.\n"
+" \n"
+" Click to add an account.\n"
+" \n"
+" An account is part of a ledger allowing your company\n"
+" to register all kinds of debit and credit transactions.\n"
+" Companies present their annual accounts in two main parts: "
+"the\n"
+" balance sheet and the income statement (profit and loss\n"
+" account). The annual accounts of a company are required by "
+"law\n"
+" to disclose a certain amount of information.\n"
+" \n"
+" Click to register a refund you received from a supplier.\n"
+" \n"
+" Instead of creating the supplier refund manually, you can "
+"generate\n"
+" refunds and reconcile them directly from the related "
+"supplier invoice.\n"
+" \n"
+" Click to add a new analytic account.\n"
+" \n"
+" The normal chart of accounts has a structure defined by the\n"
+" legal requirement of the country. The analytic chart of\n"
+" accounts structure should reflect your own business needs "
+"in\n"
+" term of costs/revenues reporting.\n"
+" \n"
+" They are usually structured by contracts, projects, products "
+"or\n"
+" departements. Most of the OpenERP operations (invoices,\n"
+" timesheets, expenses, etc) generate analytic entries on the\n"
+" related account.\n"
+" \n"
+" Click to add a journal.\n"
+" \n"
+" A journal is used to record transactions of all accounting "
+"data\n"
+" related to the day-to-day business.\n"
+" \n"
+" A typical company may use one journal per payment method "
+"(cash,\n"
+" bank accounts, checks), one purchase journal, one sale "
+"journal\n"
+" and one for miscellaneous information.\n"
+" \n"
+" Click to define a new recurring entry.\n"
+" \n"
+" A recurring entry occurs on a recurrent basis from a "
+"specific\n"
+" date, i.e. corresponding to the signature of a contract or "
+"an\n"
+" agreement with a customer or a supplier. You can create "
+"such\n"
+" entries to automate the postings in the system.\n"
+" \n"
+" Click to define a new tax code.\n"
+" \n"
+" Depending on the country, a tax code is usually a cell to "
+"fill\n"
+" in your legal tax statement. OpenERP allows you to define "
+"the\n"
+" tax structure and each tax computation will be registered "
+"in\n"
+" one or several tax code.\n"
+" \n"
+" Select the period and the journal you want to fill.\n"
+" \n"
+" This view can be used by accountants in order to quickly "
+"record\n"
+" entries in OpenERP. If you want to record a supplier "
+"invoice,\n"
+" start by recording the line of the expense account. OpenERP\n"
+" will propose to you automatically the Tax related to this\n"
+" account and the counterpart \"Account Payable\".\n"
+"
\n"
+" Invoice number: ${object.number}
\n"
+" Invoice total: ${object.amount_total} "
+"${object.currency_id.name}
\n"
+" Invoice date: ${object.date_invoice}
\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}
\n"
+" % endif\n"
+" % if object.user_id:\n"
+" Your contact: ${object.user_id.name}\n"
+" % endif\n"
+"
\n"
+" \n"
+" \n"
+" % endif\n"
+" \n"
+"
\n"
+"
\n"
+"
\n"
+" \n"
+" ${object.company_id.name}
\n"
+"
\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}
\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}
\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}
\n"
+" % endif\n"
+" \n"
+" % if object.company_id.phone:\n"
+"
\n" +" Kattintson új adóügyi év létrehozásához.\n" +"
\n" +" Határozza meg a vállalkozása üzleti évét a kívánságainak " +"megfelelően.\n" +" Egy üzleti év egy idő periódus, aminek a végén a vállalkozás " +"könyvelése\n" +" elszámolásra kerül (általában 12 hónap). Az üzleti év arra a " +"dátumra\n" +" hivatkozik általában ahol az véget ér. Például,\n" +" ha a vállalkozás pénzügyi üzleti éve 2011 november 30-ára " +"esik, akkor\n" +" minden ami 2010 december 1 és 2011 november 30 közé esik\n" +" azt hívjuk 2011 évi üzleti/pénzügyi/adóügyi évnek.\n" +"
\n" +" " #. module: account #: view:account.common.report:0 @@ -3912,6 +3938,8 @@ msgid "" "There is no fiscal year defined for this date.\n" "Please create one from the configuration of the accounting menu." msgstr "" +"Erre a dátumra nem lett üzleti adóügyi év meghatározva.\n" +"Kérem hozzon létre egyet a könyvelési menü beállítása menüpont alatt." #. module: account #: view:account.addtmpl.wizard:0 @@ -4282,6 +4310,8 @@ msgid "" "The fiscalyear, periods or chart of account chosen have to belong to the " "same company." msgstr "" +"Az üzelti adóügyi év, periódus vagy számlatükör kiválasztása ugyanarra a " +"vállalkozásra kell, hogy vonatkozzon." #. module: account #: help:account.tax.code.template,notprintable:0 @@ -7344,6 +7374,8 @@ msgid "" "Error!\n" "The start date of a fiscal year must precede its end date." msgstr "" +"Hiba!\n" +"Az üzleti adóügyi év elejének előbb kell lennie mint a végének." #. module: account #: view:account.tax.template:0 @@ -8276,7 +8308,8 @@ msgstr "" msgid "" "Select Fiscal Year which you want to remove entries for its End of year " "entries journal" -msgstr "Válassza ki az üzleti évet, amelynek a nyitó tételeit törölni akarja" +msgstr "" +"Válassza ki az üzleti évet, amelynek a záró tételei közül törölni szeretne" #. module: account #: field:account.tax.template,type_tax_use:0 @@ -8397,7 +8430,7 @@ msgstr "Gyűjtőkód karton" #. module: account #: view:account.config.settings:0 msgid "No Fiscal Year Defined for This Company" -msgstr "" +msgstr "Ehhez a vállalkozáshoz nem lett üzleti adóügyi év meghatározva" #. module: account #: view:account.invoice:0 @@ -8548,6 +8581,9 @@ msgid "" "This wizard will remove the end of year journal entries of selected fiscal " "year. Note that you can run this wizard many times for the same fiscal year." msgstr "" +"Ez a varázsló a kiválasztott üzleti adóügyi évet lezáró könyvelési napló " +"tételeit fogja eltávolítani. Megjegyezzük, hogy ezt a varázslót többször is " +"elindíthatja ugyanarra az üzleti évre." #. module: account #: report:account.invoice:0 @@ -8732,7 +8768,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close_state msgid "Fiscalyear Close state" -msgstr "Üzleti év zárása" +msgstr "Üzleti év zárt állapotban" #. module: account #: field:account.invoice.refund,journal_id:0 @@ -9161,7 +9197,7 @@ msgstr "" #. module: account #: field:account.config.settings,has_fiscal_year:0 msgid "Company has a fiscal year" -msgstr "" +msgstr "Vállalkozásnak van üzleti, adóügyi éve" #. module: account #: help:account.tax,child_depend:0 @@ -9599,6 +9635,9 @@ msgid "" "The period is invalid. Either some periods are overlapping or the period's " "dates are not matching the scope of the fiscal year." msgstr "" +"Hiba!\n" +"Az időszak nem érvényes. Vagy az egyes időszakok átfedik egymást vagy az " +"időszakok nem egyeznek az üzleti év határidőivel." #. module: account #: report:account.overdue:0 @@ -9897,7 +9936,7 @@ msgstr "Gyűjtőkódokból" #. module: account #: view:account.installer:0 msgid "Configure your Fiscal Year" -msgstr "" +msgstr "Állítsa be az üzleti, adóügyi évét" #. module: account #: field:account.period,name:0 @@ -10834,6 +10873,8 @@ msgstr "Könyvelési tételsorok jóváhagyása" msgid "" "The fiscal position will determine taxes and accounts used for the partner." msgstr "" +"Az ÁFA pozíció meghatározza a partnerre vonatkozó adókat és főkönyvi " +"számlákat." #. module: account #: model:process.node,note:account.process_node_supplierpaidinvoice0 @@ -10906,7 +10947,7 @@ msgstr "" #: view:ir.sequence:0 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear msgid "Fiscal Years" -msgstr "Üzleti év" +msgstr "Üzleti évek" #. module: account #: help:account.analytic.journal,active:0 diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index 55362cf55a0..f6ab25cbc72 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-08-21 06:06+0000\n" -"Last-Translator: Boyce Huang