diff --git a/addons/account/account.py b/addons/account/account.py index f6dd36c01fc..d0e9c501bb9 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1331,6 +1331,7 @@ class account_move(osv.osv): def _centralise(self, cr, uid, move, mode, context=None): assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection + currency_obj = self.pool.get('res.currency') if context is None: context = {} @@ -1381,6 +1382,34 @@ class account_move(osv.osv): cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2)) result = cr.fetchone()[0] or 0.0 cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id)) + + #adjust also the amount in currency if needed + cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,)) + for row in cr.dictfetchall(): + currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context) + if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']): + amount_currency = row['amount_currency'] * -1 + account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id + cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %slimit 1', (move.id, row['currency_id'])) + res = cr.fetchone() + if res: + cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0])) + else: + context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id}) + line_id = self.pool.get('account.move.line').create(cr, uid, { + 'name': _('Currency Adjustment'), + 'centralisation': 'currency', + 'account_id': account_id, + 'move_id': move.id, + 'journal_id': move.journal_id.id, + 'period_id': move.period_id.id, + 'date': move.period_id.date_stop, + 'debit': 0.0, + 'credit': 0.0, + 'currency_id': row['currency_id'], + 'amount_currency': amount_currency, + }, context) + return True # diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 0b17eb676f6..2117d7fc40e 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -503,7 +503,7 @@ class account_move_line(osv.osv): }), 'date_created': fields.date('Creation date', select=True), 'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'), - 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6), + 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8), 'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'), 'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True, help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'), diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index beb23c9ebc3..2a22324d015 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -19,7 +19,6 @@ rml="account/report/account_print_invoice.rml" string="Invoices" attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))" - attachment_use="1" multi="True"/> diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index 2f0e6798408..a4c12ebb0bb 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.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: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-19 11:12+0000\n" -"Last-Translator: bamuhrez \n" +"PO-Revision-Date: 2011-06-18 11:20+0000\n" +"Last-Translator: Ahmed Mokhlis \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: 2011-04-29 05:04+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-19 04:37+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -24,7 +24,7 @@ msgstr "الدفع عن طريق النظام" #. module: account #: view:account.journal:0 msgid "Other Configuration" -msgstr "" +msgstr "تعديلات أخرى" #. module: account #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 @@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year" msgstr "لايوجد نهاية لسجل السنة للعام المحاسبي" #. module: account -#: code:addons/account/account.py:506 +#: code:addons/account/account.py:516 #, python-format msgid "" "You cannot remove/deactivate an account which is set as a property to any " @@ -65,7 +65,7 @@ msgid "Residual" msgstr "متبقي" #. module: account -#: code:addons/account/invoice.py:785 +#: code:addons/account/invoice.py:793 #, python-format msgid "Please define sequence on invoice journal" msgstr "" @@ -78,7 +78,7 @@ msgstr "خظأ! إن مدة الفترة أو الفترات غير صالحة " #. module: account #: field:account.analytic.line,currency_id:0 msgid "Account currency" -msgstr "" +msgstr "عملة الحساب" #. module: account #: view:account.tax:0 @@ -101,6 +101,7 @@ msgid "" "The Profit and Loss report gives you an overview of your company profit and " "loss in a single document" msgstr "" +"تقرير المكسب و الخسارة يعطيك فكرة عامة عن مكسب و خسارة شركتك في ملف واحد" #. module: account #: model:process.transition,name:account.process_transition_invoiceimport0 @@ -130,7 +131,7 @@ msgid "Accounting Entries-" msgstr "المدخلات المحاسبية -" #. module: account -#: code:addons/account/account.py:1291 +#: code:addons/account/account.py:1305 #, python-format msgid "You can not delete posted movement: \"%s\"!" msgstr "" @@ -174,7 +175,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/invoice.py:1421 +#: code:addons/account/invoice.py:1436 #, python-format msgid "Warning!" msgstr "تحذير!" @@ -226,7 +227,7 @@ msgid "account.tax" msgstr "" #. module: account -#: code:addons/account/account.py:901 +#: code:addons/account/account.py:915 #, python-format msgid "" "No period defined for this date: %s !\n" @@ -254,7 +255,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/invoice.py:1210 +#: code:addons/account/invoice.py:1224 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" msgstr "" @@ -270,7 +271,7 @@ msgid "Belgian Reports" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1176 +#: code:addons/account/account_move_line.py:1182 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "" @@ -308,7 +309,7 @@ msgid "St." msgstr "" #. module: account -#: code:addons/account/invoice.py:529 +#: code:addons/account/invoice.py:532 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "" @@ -415,7 +416,7 @@ msgstr "" #. module: account #: field:account.journal,default_debit_account_id:0 msgid "Default Debit Account" -msgstr "" +msgstr "الحساب المدين الافتراضي" #. module: account #: view:account.move:0 @@ -550,7 +551,7 @@ msgid "Not reconciled transactions" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:348 +#: code:addons/account/account_cash_statement.py:349 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" msgstr "" @@ -632,7 +633,7 @@ msgid "Tax Code Amount" msgstr "" #. module: account -#: code:addons/account/account.py:2779 +#: code:addons/account/account.py:2823 #: code:addons/account/installer.py:434 #, python-format msgid "SAJ" @@ -665,8 +666,8 @@ msgid "Journal Period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "" @@ -727,7 +728,7 @@ msgid "Analytic Entries by line" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:39 +#: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice !" msgstr "" @@ -828,7 +829,7 @@ msgid "Next Partner to reconcile" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1191 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "" "You can not do this modification on a confirmed entry ! Please note that you " @@ -950,11 +951,11 @@ msgid "Code" msgstr "" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 +#: code:addons/account/account_move_line.py:169 #: code:addons/account/invoice.py:73 -#: code:addons/account/invoice.py:670 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "No Analytic Journal !" @@ -1033,7 +1034,6 @@ msgstr "" #. module: account #: report:account.analytic.account.journal:0 -#: report:account.move.voucher:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "-" @@ -1119,6 +1119,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1126,7 +1127,7 @@ msgid "Entry Label" msgstr "" #. module: account -#: code:addons/account/account.py:976 +#: code:addons/account/account.py:990 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "" @@ -1264,7 +1265,6 @@ msgid "Journal Items Analysis" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_partner_all #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "" @@ -1294,7 +1294,7 @@ msgid "Central Journal" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "You can not use this general account in this journal !" msgstr "" @@ -1387,7 +1387,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/invoice.py:815 +#: code:addons/account/invoice.py:823 #, python-format msgid "" "Cannot create the invoice !\n" @@ -1546,7 +1546,6 @@ msgid "Separated Journal Sequences" msgstr "" #. module: account -#: field:account.bank.statement,user_id:0 #: view:account.invoice:0 msgid "Responsible" msgstr "" @@ -1613,7 +1612,7 @@ msgid "Error! You cannot define overlapping fiscal years" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:799 #, python-format msgid "The account is not defined to be reconciled !" msgstr "" @@ -1646,7 +1645,7 @@ msgid "Receivables & Payables" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:806 #, python-format msgid "You have to provide an account for the write off entry !" msgstr "" @@ -1682,7 +1681,7 @@ msgid "Customer Ref:" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:328 +#: code:addons/account/account_cash_statement.py:329 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "" @@ -1703,7 +1702,7 @@ msgid "Tax Declaration: Credit Notes" msgstr "" #. module: account -#: code:addons/account/account.py:499 +#: code:addons/account/account.py:509 #, python-format msgid "You cannot deactivate an account that contains account moves." msgstr "" @@ -1719,7 +1718,7 @@ msgid "You can not create move line on closed account." msgstr "" #. module: account -#: code:addons/account/account.py:519 +#: code:addons/account/account.py:529 #, python-format msgid "" "You cannot change the type of account from 'Closed' to any other type which " @@ -1988,7 +1987,7 @@ msgid " Journal" msgstr "" #. module: account -#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1333 #, python-format msgid "" "There is no default default debit account defined \n" @@ -2040,7 +2039,7 @@ msgid "Description" msgstr "" #. module: account -#: code:addons/account/account.py:2844 +#: code:addons/account/account.py:2888 #: code:addons/account/installer.py:498 #, python-format msgid "ECNJ" @@ -2060,7 +2059,7 @@ msgid "Income Account" msgstr "" #. module: account -#: code:addons/account/invoice.py:352 +#: code:addons/account/invoice.py:351 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "" @@ -2071,6 +2070,7 @@ msgid "Accounting Properties" msgstr "" #. module: account +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 msgid "Entries Sorted By" @@ -2099,6 +2099,7 @@ msgstr "" #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2207,7 +2208,7 @@ msgid "Account Tax Code" msgstr "كود الحساب الضريبي" #. module: account -#: code:addons/account/invoice.py:545 +#: code:addons/account/invoice.py:552 #, python-format msgid "" "Can't find any account journal of %s type for this company.\n" @@ -2277,7 +2278,7 @@ msgid "Account Model Entries" msgstr "إدخالات نماذج الحسابات" #. module: account -#: code:addons/account/account.py:2796 +#: code:addons/account/account.py:2840 #: code:addons/account/installer.py:454 #, python-format msgid "EXJ" @@ -2361,7 +2362,7 @@ msgid "Accounts" msgstr "" #. module: account -#: code:addons/account/invoice.py:351 +#: code:addons/account/invoice.py:350 #, python-format msgid "Configuration Error!" msgstr "" @@ -2373,13 +2374,12 @@ msgid "Average Price" msgstr "" #. module: account -#: report:account.move.voucher:0 #: report:account.overdue:0 msgid "Date:" msgstr "" #. module: account -#: code:addons/account/account.py:640 +#: code:addons/account/account.py:654 #, python-format msgid "" "You cannot modify company of this journal as its related record exist in " @@ -2415,6 +2415,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2523,16 +2524,16 @@ msgid "This wizard will create recurring accounting entries" msgstr "" #. module: account -#: code:addons/account/account.py:1181 +#: code:addons/account/account.py:1195 #, python-format msgid "No sequence defined on the journal !" msgstr "" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 -#: code:addons/account/invoice.py:670 +#: code:addons/account/account_move_line.py:169 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" @@ -2692,7 +2693,7 @@ msgid "Analytic Entries" msgstr "" #. module: account -#: code:addons/account/account.py:822 +#: code:addons/account/account.py:836 #, python-format msgid "" "No fiscal year defined for this date !\n" @@ -2815,7 +2816,7 @@ msgid "BNK%s" msgstr "" #. module: account -#: code:addons/account/account.py:2906 +#: code:addons/account/account.py:2950 #: code:addons/account/installer.py:296 #, python-format msgid "BNK" @@ -2924,6 +2925,7 @@ msgstr "" #: field:account.common.report,journal_ids:0 #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 +#: report:account.general.ledger_landscape:0 #: view:account.journal.period:0 #: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 @@ -2984,7 +2986,7 @@ msgid "Starting Balance" msgstr "" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "No Partner Defined !" msgstr "" @@ -3026,7 +3028,6 @@ msgstr "" #: view:account.invoice.report:0 #: selection:account.invoice.report,state:0 #: selection:account.journal.period,state:0 -#: report:account.move.voucher:0 #: view:account.subscription:0 #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 @@ -3078,7 +3079,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Cannot delete invoice(s) that are already opened or paid !" msgstr "" @@ -3139,7 +3140,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:532 #, python-format msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " @@ -3148,6 +3149,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" msgstr "" @@ -3250,6 +3252,7 @@ msgstr "" #: field:account.entries.report,date:0 #: selection:account.general.journal,filter:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice.report,date:0 #: report:account.journal.period.print:0 #: view:account.move:0 @@ -3293,7 +3296,7 @@ msgid "Chart of Accounts Template" msgstr "" #. module: account -#: code:addons/account/account.py:2095 +#: code:addons/account/account.py:2109 #, python-format msgid "" "Maturity date of entry line generated by model line '%s' of model '%s' is " @@ -3302,13 +3305,13 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:810 +#: code:addons/account/account_move_line.py:801 #, python-format msgid "Some entries are already reconciled !" msgstr "" #. module: account -#: code:addons/account/account.py:1204 +#: code:addons/account/account.py:1218 #, python-format msgid "" "You cannot validate a Journal Entry unless all journal items are in same " @@ -3428,7 +3431,7 @@ msgid "Analytic Items" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "Unable to change tax !" msgstr "" @@ -3439,14 +3442,14 @@ msgid "#Entries" msgstr "" #. module: account -#: code:addons/account/invoice.py:1422 +#: code:addons/account/invoice.py:1437 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." msgstr "" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #, python-format msgid "" "The Payment Term of Supplier does not have Payment Term Lines(Computation) " @@ -3740,7 +3743,7 @@ msgid "Acc.Type" msgstr "" #. module: account -#: code:addons/account/invoice.py:714 +#: code:addons/account/invoice.py:722 #, python-format msgid "Global taxes defined, but are not in invoice lines !" msgstr "" @@ -3799,7 +3802,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:91 +#: code:addons/account/account_analytic_line.py:90 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -3974,7 +3977,7 @@ msgid "Credit Notes" msgstr "" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "Unable to find a valid period !" @@ -4045,11 +4048,11 @@ msgid "Change" msgstr "" #. module: account -#: code:addons/account/account.py:1290 -#: code:addons/account/account.py:1318 -#: code:addons/account/account.py:1325 -#: code:addons/account/account_move_line.py:1055 -#: code:addons/account/invoice.py:896 +#: code:addons/account/account.py:1304 +#: code:addons/account/account.py:1332 +#: code:addons/account/account.py:1339 +#: code:addons/account/account_move_line.py:1061 +#: code:addons/account/invoice.py:904 #: code:addons/account/wizard/account_automatic_reconcile.py:152 #: code:addons/account/wizard/account_fiscalyear_close.py:78 #: code:addons/account/wizard/account_fiscalyear_close.py:81 @@ -4153,7 +4156,7 @@ msgid "You must define an analytic journal of type '%s' !" msgstr "" #. module: account -#: code:addons/account/account.py:1397 +#: code:addons/account/account.py:1411 #, python-format msgid "" "Couldn't create move with currency different from the secondary currency of " @@ -4218,7 +4221,7 @@ msgid "Invoices" msgstr "" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "" "Please verify the price of the invoice !\n" @@ -4330,25 +4333,24 @@ msgid "Third Party (Country)" msgstr "" #. module: account -#: code:addons/account/account.py:938 -#: code:addons/account/account.py:940 -#: code:addons/account/account.py:1181 -#: code:addons/account/account.py:1393 -#: code:addons/account/account.py:1397 -#: code:addons/account/account_cash_statement.py:249 -#: code:addons/account/account_move_line.py:780 -#: code:addons/account/account_move_line.py:803 -#: code:addons/account/account_move_line.py:805 -#: code:addons/account/account_move_line.py:808 -#: code:addons/account/account_move_line.py:810 -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account.py:952 +#: code:addons/account/account.py:954 +#: code:addons/account/account.py:1195 +#: code:addons/account/account.py:1407 +#: code:addons/account/account.py:1411 +#: code:addons/account/account_cash_statement.py:250 +#: code:addons/account/account_move_line.py:771 +#: code:addons/account/account_move_line.py:794 +#: code:addons/account/account_move_line.py:796 +#: code:addons/account/account_move_line.py:799 +#: code:addons/account/account_move_line.py:801 +#: code:addons/account/account_move_line.py:1123 #: code:addons/account/report/common_report_header.py:92 -#: code:addons/account/wizard/account_change_currency.py:39 -#: code:addons/account/wizard/account_change_currency.py:60 -#: code:addons/account/wizard/account_change_currency.py:65 -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:38 +#: code:addons/account/wizard/account_change_currency.py:59 +#: code:addons/account/wizard/account_change_currency.py:64 +#: code:addons/account/wizard/account_change_currency.py:70 #: code:addons/account/wizard/account_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_report_common.py:120 #: code:addons/account/wizard/account_report_common.py:126 #, python-format @@ -4370,7 +4372,7 @@ msgid "Bank Details" msgstr "" #. module: account -#: code:addons/account/invoice.py:720 +#: code:addons/account/invoice.py:728 #, python-format msgid "Taxes missing !" msgstr "" @@ -4425,7 +4427,7 @@ msgid "Check Date not in the Period" msgstr "" #. module: account -#: code:addons/account/account.py:1210 +#: code:addons/account/account.py:1224 #, python-format msgid "" "You can not modify a posted entry of this journal !\n" @@ -4444,7 +4446,7 @@ msgid "Child Tax Accounts" msgstr "" #. module: account -#: code:addons/account/account.py:940 +#: code:addons/account/account.py:954 #, python-format msgid "Start period should be smaller then End period" msgstr "" @@ -4474,6 +4476,7 @@ msgstr "" #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 #: report:account.partner.balance:0 @@ -4556,7 +4559,7 @@ msgid "Line 1:" msgstr "" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "Integrity Error !" msgstr "" @@ -4591,7 +4594,7 @@ msgstr "" #: field:account.invoice.tax,account_id:0 #: field:account.move.line,tax_code_id:0 msgid "Tax Account" -msgstr "" +msgstr "حساب الضرائب" #. module: account #: view:account.automatic.reconcile:0 @@ -4702,7 +4705,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "No period found !" @@ -4774,7 +4777,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:2896 +#: code:addons/account/account.py:2940 #: code:addons/account/installer.py:283 #: code:addons/account/installer.py:295 #, python-format @@ -4802,7 +4805,7 @@ msgid "Start of period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1193 +#: code:addons/account/account_move_line.py:1199 #, python-format msgid "" "You can not do this modification on a reconciled entry ! Please note that " @@ -4858,12 +4861,12 @@ msgstr "" #. module: account #: code:addons/account/account_bank_statement.py:331 -#: code:addons/account/invoice.py:405 -#: code:addons/account/invoice.py:505 -#: code:addons/account/invoice.py:520 -#: code:addons/account/invoice.py:528 -#: code:addons/account/invoice.py:545 -#: code:addons/account/invoice.py:1347 +#: code:addons/account/invoice.py:408 +#: code:addons/account/invoice.py:508 +#: code:addons/account/invoice.py:523 +#: code:addons/account/invoice.py:531 +#: code:addons/account/invoice.py:552 +#: code:addons/account/invoice.py:1361 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" @@ -4940,7 +4943,7 @@ msgid "Sort By" msgstr "" #. module: account -#: code:addons/account/account.py:1326 +#: code:addons/account/account.py:1340 #, python-format msgid "" "There is no default default credit account defined \n" @@ -4960,7 +4963,7 @@ msgstr "" msgid "" "Specified Journal does not have any account move entries in draft state for " "this period" -msgstr "" +msgstr "اليومية المختارة لا تشمل أي حساب، لذا أضفها بالمسودات لهذه الفترة" #. module: account #: model:ir.actions.act_window,name:account.action_view_move_line @@ -5087,7 +5090,7 @@ msgid "Generate Opening Entries" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:738 +#: code:addons/account/account_move_line.py:729 #, python-format msgid "Already Reconciled!" msgstr "" @@ -5123,7 +5126,7 @@ msgstr "" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:830 +#: code:addons/account/account_move_line.py:821 #, python-format msgid "Write-Off" msgstr "" @@ -5260,7 +5263,7 @@ msgid "# of Lines" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:60 +#: code:addons/account/wizard/account_change_currency.py:59 #, python-format msgid "New currency is not confirured properly !" msgstr "" @@ -5285,14 +5288,14 @@ msgid "Filter by" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "You can not use an inactive account!" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:794 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "" @@ -5327,7 +5330,7 @@ msgstr "" #. module: account #: code:addons/account/account_bank_statement.py:391 -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Invalid action !" msgstr "" @@ -5538,7 +5541,7 @@ msgid "Companies" msgstr "" #. module: account -#: code:addons/account/account.py:532 +#: code:addons/account/account.py:546 #, python-format msgid "" "You cannot modify Company of account as its related record exist in Entry " @@ -5804,9 +5807,9 @@ msgid "Optional create" msgstr "" #. module: account -#: code:addons/account/invoice.py:406 -#: code:addons/account/invoice.py:506 -#: code:addons/account/invoice.py:1348 +#: code:addons/account/invoice.py:409 +#: code:addons/account/invoice.py:509 +#: code:addons/account/invoice.py:1362 #, python-format msgid "Can not find account chart for this company, Please Create account." msgstr "" @@ -5955,8 +5958,8 @@ msgid "Analytic Entries Statistics" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:143 -#: code:addons/account/account_move_line.py:905 +#: code:addons/account/account_analytic_line.py:141 +#: code:addons/account/account_move_line.py:897 #, python-format msgid "Entries: " msgstr "" @@ -5967,7 +5970,7 @@ msgid "Create manual recurring entries in a chosen journal." msgstr "" #. module: account -#: code:addons/account/account.py:1393 +#: code:addons/account/account.py:1407 #, python-format msgid "Couldn't create move between different companies" msgstr "" @@ -6005,7 +6008,7 @@ msgid "Total debit" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:781 +#: code:addons/account/account_move_line.py:772 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "" @@ -6069,30 +6072,31 @@ msgid " valuation: percent" msgstr "" #. module: account -#: code:addons/account/account.py:499 -#: code:addons/account/account.py:501 -#: code:addons/account/account.py:822 -#: code:addons/account/account.py:901 -#: code:addons/account/account.py:976 -#: code:addons/account/account.py:1204 -#: code:addons/account/account.py:1210 -#: code:addons/account/account.py:2095 -#: code:addons/account/account.py:2333 -#: code:addons/account/account_analytic_line.py:90 -#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account.py:509 +#: code:addons/account/account.py:511 +#: code:addons/account/account.py:836 +#: code:addons/account/account.py:915 +#: code:addons/account/account.py:990 +#: code:addons/account/account.py:1218 +#: code:addons/account/account.py:1224 +#: code:addons/account/account.py:2109 +#: code:addons/account/account.py:2357 +#: code:addons/account/account_analytic_line.py:89 +#: code:addons/account/account_analytic_line.py:98 #: code:addons/account/account_bank_statement.py:292 #: code:addons/account/account_bank_statement.py:305 #: code:addons/account/account_bank_statement.py:345 -#: code:addons/account/account_cash_statement.py:328 -#: code:addons/account/account_cash_statement.py:348 -#: code:addons/account/account_move_line.py:1176 -#: code:addons/account/account_move_line.py:1191 -#: code:addons/account/account_move_line.py:1193 -#: code:addons/account/invoice.py:785 -#: code:addons/account/invoice.py:815 -#: code:addons/account/invoice.py:1008 +#: code:addons/account/account_cash_statement.py:329 +#: code:addons/account/account_cash_statement.py:349 +#: code:addons/account/account_move_line.py:1182 +#: code:addons/account/account_move_line.py:1197 +#: code:addons/account/account_move_line.py:1199 +#: code:addons/account/invoice.py:793 +#: code:addons/account/invoice.py:823 +#: code:addons/account/invoice.py:1014 #: code:addons/account/wizard/account_invoice_refund.py:100 #: code:addons/account/wizard/account_invoice_refund.py:102 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" @@ -6202,7 +6206,7 @@ msgid "Journal Select" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:65 +#: code:addons/account/wizard/account_change_currency.py:64 #, python-format msgid "Currnt currency is not confirured properly !" msgstr "" @@ -6219,9 +6223,11 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger +#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" msgstr "" @@ -6275,7 +6281,7 @@ msgid "Total:" msgstr "" #. module: account -#: code:addons/account/account.py:2050 +#: code:addons/account/account.py:2064 #, python-format msgid "" "You can specify year, month and date in the name of the model using the " @@ -6305,7 +6311,7 @@ msgid "Child Codes" msgstr "" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #: code:addons/account/wizard/account_invoice_refund.py:137 #, python-format msgid "Data Insufficient !" @@ -6462,7 +6468,7 @@ msgid "Lines" msgstr "" #. module: account -#: code:addons/account/invoice.py:521 +#: code:addons/account/invoice.py:524 #, python-format msgid "" "Can not find account chart for this company in invoice line account, Please " @@ -6630,7 +6636,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:938 +#: code:addons/account/account.py:952 #, python-format msgid "You should have chosen periods that belongs to the same company" msgstr "" @@ -6734,7 +6740,7 @@ msgid "Sign on Reports" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:249 +#: code:addons/account/account_cash_statement.py:250 #, python-format msgid "You can not have two open register for the same journal" msgstr "" @@ -6763,7 +6769,6 @@ msgstr "" #. module: account #: report:account.invoice:0 #: view:account.invoice:0 -#: report:account.move.voucher:0 msgid "PRO-FORMA" msgstr "" @@ -6793,6 +6798,7 @@ msgstr "" #. module: account #: view:account.analytic.line:0 +#: field:account.bank.statement,user_id:0 #: view:account.journal:0 #: field:account.journal,user_id:0 #: view:analytic.entries.report:0 @@ -6818,13 +6824,13 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "Bad account !" msgstr "" #. module: account -#: code:addons/account/account.py:2777 +#: code:addons/account/account.py:2821 #: code:addons/account/installer.py:432 #, python-format msgid "Sales Journal" @@ -6842,7 +6848,7 @@ msgid "Invoice Tax" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "No piece number !" msgstr "" @@ -7079,17 +7085,17 @@ msgid "Fixed" msgstr "" #. module: account -#: code:addons/account/account.py:506 -#: code:addons/account/account.py:519 -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:516 +#: code:addons/account/account.py:529 #: code:addons/account/account.py:532 -#: code:addons/account/account.py:640 -#: code:addons/account/account.py:927 -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 -#: code:addons/account/invoice.py:714 -#: code:addons/account/invoice.py:717 -#: code:addons/account/invoice.py:720 +#: code:addons/account/account.py:546 +#: code:addons/account/account.py:654 +#: code:addons/account/account.py:941 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/invoice.py:722 +#: code:addons/account/invoice.py:725 +#: code:addons/account/invoice.py:728 #, python-format msgid "Warning !" msgstr "" @@ -7121,6 +7127,7 @@ msgstr "" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7151,7 +7158,7 @@ msgid "Can not %s draft/proforma/cancel invoice." msgstr "" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "No Invoice Lines !" msgstr "" @@ -7200,7 +7207,7 @@ msgid "Deferral Method" msgstr "" #. module: account -#: code:addons/account/invoice.py:359 +#: code:addons/account/invoice.py:360 #, python-format msgid "Invoice '%s' is paid." msgstr "" @@ -7261,7 +7268,7 @@ msgid "Associated Partner" msgstr "" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "You must first select a partner !" msgstr "" @@ -7326,7 +7333,7 @@ msgid "Choose Fiscal Year" msgstr "" #. module: account -#: code:addons/account/account.py:2841 +#: code:addons/account/account.py:2885 #: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" @@ -7361,6 +7368,7 @@ msgstr "" #: view:account.entries.report:0 #: field:account.entries.report,period_id:0 #: view:account.fiscalyear:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: view:account.invoice.report:0 #: field:account.journal.period,period_id:0 @@ -7523,7 +7531,7 @@ msgid "Account Types" msgstr "" #. module: account -#: code:addons/account/invoice.py:897 +#: code:addons/account/invoice.py:905 #, python-format msgid "Cannot create invoice move on centralised journal" msgstr "" @@ -7573,6 +7581,7 @@ msgstr "" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 +#: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 msgid "Filter By" msgstr "" @@ -7611,7 +7620,7 @@ msgid "Payment Term Line" msgstr "" #. module: account -#: code:addons/account/account.py:2794 +#: code:addons/account/account.py:2838 #: code:addons/account/installer.py:452 #, python-format msgid "Purchase Journal" @@ -7778,8 +7787,8 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "Bad account!" msgstr "" @@ -7790,7 +7799,7 @@ msgid "Keep empty for all open fiscal years" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1056 +#: code:addons/account/account_move_line.py:1062 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" msgstr "" @@ -7811,6 +7820,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -7983,14 +7993,14 @@ msgid "Period from" msgstr "" #. module: account -#: code:addons/account/account.py:2817 +#: code:addons/account/account.py:2861 #: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" msgstr "" #. module: account -#: code:addons/account/account.py:927 +#: code:addons/account/account.py:941 #, python-format msgid "" "You cannot modify company of this period as its related record exist in " @@ -8039,7 +8049,7 @@ msgid "Purchase Tax(%)" msgstr "" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "Please create some invoice lines." msgstr "" @@ -8055,7 +8065,7 @@ msgid "Configure Your Accounting Application" msgstr "" #. module: account -#: code:addons/account/account.py:2820 +#: code:addons/account/account.py:2864 #: code:addons/account/installer.py:479 #, python-format msgid "SCNJ" @@ -8093,6 +8103,7 @@ msgstr "" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8102,7 +8113,7 @@ msgid "Start Period" msgstr "" #. module: account -#: code:addons/account/account.py:2333 +#: code:addons/account/account.py:2357 #, python-format msgid "Cannot locate parent code for template account!" msgstr "" @@ -8139,7 +8150,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. " msgstr "" #. module: account -#: code:addons/account/invoice.py:1008 +#: code:addons/account/invoice.py:1014 #, python-format msgid "" "You cannot cancel the Invoice which is Partially Paid! You need to " @@ -8167,7 +8178,7 @@ msgid "You can not create move line on view account." msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not confirured properly !" msgstr "" @@ -8216,6 +8227,7 @@ msgstr "" #: field:account.entries.report,balance:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8234,6 +8246,7 @@ msgstr "" #. module: account #: report:account.account.balance:0 +#: report:account.general.ledger_landscape:0 msgid "Display Account" msgstr "" @@ -8348,6 +8361,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.line,move_id:0 #: field:analytic.entries.report,move_id:0 @@ -8355,7 +8369,7 @@ msgid "Move" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "" @@ -8449,6 +8463,7 @@ msgstr "" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8492,7 +8507,7 @@ msgid "Account Subscription" msgstr "" #. module: account -#: code:addons/account/invoice.py:717 +#: code:addons/account/invoice.py:725 #, python-format msgid "" "Tax base different !\n" @@ -8519,6 +8534,7 @@ msgstr "" #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_start:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -8547,7 +8563,7 @@ msgid "Unreconciled" msgstr "" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "Bad total !" msgstr "" @@ -8605,13 +8621,13 @@ msgid "Active" msgstr "" #. module: account -#: code:addons/account/invoice.py:354 +#: code:addons/account/invoice.py:353 #, python-format msgid "Unknown Error" msgstr "" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "" "You cannot validate a non-balanced entry !\n" @@ -8654,10 +8670,10 @@ msgstr "" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -8893,7 +8909,6 @@ msgstr "" #: view:account.move:0 #: selection:account.move,state:0 #: view:account.move.line:0 -#: report:account.move.voucher:0 msgid "Posted" msgstr "" @@ -8912,6 +8927,7 @@ msgstr "" #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_stop:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -8965,7 +8981,7 @@ msgid "This is a model for recurring accounting entries" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:100 +#: code:addons/account/account_analytic_line.py:99 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -9115,8 +9131,8 @@ msgid "End period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:738 -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:729 +#: code:addons/account/account_move_line.py:806 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_report_balance_sheet.py:70 @@ -9182,10 +9198,10 @@ msgstr "" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9219,7 +9235,7 @@ msgid "Recurring" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:805 +#: code:addons/account/account_move_line.py:796 #, python-format msgid "Entry is already reconciled" msgstr "" @@ -9240,7 +9256,7 @@ msgid "Range" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "" "Can not create an automatic sequence for this piece !\n" @@ -9370,7 +9386,7 @@ msgid "Accounts Mapping" msgstr "" #. module: account -#: code:addons/account/invoice.py:346 +#: code:addons/account/invoice.py:345 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "" @@ -9395,7 +9411,7 @@ msgid "The income or expense account related to the selected product." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1123 #, python-format msgid "The date of your Journal Entry is not in the defined period!" msgstr "" @@ -9600,7 +9616,7 @@ msgid "You must enter a period length that cannot be 0 or below !" msgstr "" #. module: account -#: code:addons/account/account.py:501 +#: code:addons/account/account.py:511 #, python-format msgid "You cannot remove an account which has account entries!. " msgstr "" diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po index 6ce752d5ce0..5a93cd3609a 100644 --- a/addons/account/i18n/es_CL.po +++ b/addons/account/i18n/es_CL.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-11 04:07+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-06-06 18:06+0000\n" +"Last-Translator: Hector Rojas (doingIT.cl) \n" "Language-Team: Spanish (Chile) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-12 04:35+0000\n" +"X-Launchpad-Export-Date: 2011-06-07 04:35+0000\n" "X-Generator: Launchpad (build 12959)\n" #. module: account @@ -44,7 +44,7 @@ msgstr "" #. module: account #: view:account.move.reconcile:0 msgid "Journal Entry Reconcile" -msgstr "" +msgstr "Conciliar asiento contable" #. module: account #: field:account.installer.modules,account_voucher:0 @@ -63,7 +63,7 @@ msgstr "" #: field:account.invoice,residual:0 #: field:report.invoice.created,residual:0 msgid "Residual" -msgstr "" +msgstr "Pendiente" #. module: account #: code:addons/account/invoice.py:793 @@ -89,7 +89,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_report_aged_receivable msgid "Aged Receivable Till Today" -msgstr "" +msgstr "A cobrar vencidos hasta hoy" #. module: account #: field:account.partner.ledger,reconcil:0 @@ -124,11 +124,14 @@ msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disabled" msgstr "" +"Si rompe la conciliación de transacciones, también debe verificar todas la " +"acciones que están relacionadas con esas transacciones porque no serán " +"deshabilitadas." #. module: account #: report:account.tax.code.entries:0 msgid "Accounting Entries-" -msgstr "" +msgstr "Asientos contables -" #. module: account #: code:addons/account/account.py:1305 @@ -140,7 +143,7 @@ msgstr "" #: report:account.invoice:0 #: field:account.invoice.line,origin:0 msgid "Origin" -msgstr "" +msgstr "Origen" #. module: account #: view:account.account:0 @@ -150,7 +153,7 @@ msgstr "" #: view:account.move.line.reconcile:0 #: view:account.move.line.reconcile.writeoff:0 msgid "Reconcile" -msgstr "" +msgstr "Conciliar" #. module: account #: field:account.bank.statement.line,ref:0 @@ -178,7 +181,7 @@ msgstr "" #: code:addons/account/invoice.py:1436 #, python-format msgid "Warning!" -msgstr "" +msgstr "¡Advertencia!" #. module: account #: field:account.fiscal.position.account,account_src_id:0 @@ -199,7 +202,7 @@ msgstr "" #. module: account #: selection:account.account.type,sign:0 msgid "Negative" -msgstr "" +msgstr "Negativo" #. module: account #: code:addons/account/wizard/account_move_journal.py:95 @@ -224,7 +227,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax msgid "account.tax" -msgstr "" +msgstr "account.tax" #. module: account #: code:addons/account/account.py:915 @@ -317,7 +320,7 @@ msgstr "" #. module: account #: field:account.journal.column,field:0 msgid "Field Name" -msgstr "" +msgstr "Nombre del Campo" #. module: account #: help:account.installer,charts:0 @@ -351,7 +354,7 @@ msgstr "" #: view:account.installer:0 #: view:account.installer.modules:0 msgid "Configure" -msgstr "" +msgstr "Configurar" #. module: account #: selection:account.entries.report,month:0 @@ -360,7 +363,7 @@ msgstr "" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "June" -msgstr "" +msgstr "Junio" #. module: account #: model:ir.actions.act_window,help:account.action_account_moves_bank @@ -373,18 +376,18 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax_template msgid "account.tax.template" -msgstr "" +msgstr "account.tax.template" #. module: account #: model:ir.model,name:account.model_account_bank_accounts_wizard msgid "account.bank.accounts.wizard" -msgstr "" +msgstr "account.bank.accounts.wizard" #. module: account #: field:account.move.line,date_created:0 #: field:account.move.reconcile,create_date:0 msgid "Creation date" -msgstr "" +msgstr "Fecha de creación" #. module: account #: selection:account.journal,type:0 @@ -416,17 +419,17 @@ msgstr "" #. module: account #: field:account.journal,default_debit_account_id:0 msgid "Default Debit Account" -msgstr "" +msgstr "Cuenta debito por defecto" #. module: account #: view:account.move:0 msgid "Total Credit" -msgstr "" +msgstr "Total crédito" #. module: account #: selection:account.account.type,sign:0 msgid "Positive" -msgstr "" +msgstr "Positivo" #. module: account #: view:account.move.line.unreconcile.select:0 diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po index 67fea52771c..2008cd4d734 100644 --- a/addons/account/i18n/he.po +++ b/addons/account/i18n/he.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-11 16:15+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2011-06-19 07:00+0000\n" +"Last-Translator: Natan Alter \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-20 04:33+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "System payment" -msgstr "" +msgstr "מערכת תשלומים" #. module: account #: view:account.journal:0 msgid "Other Configuration" -msgstr "" +msgstr "תצורה אחרת" #. module: account #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 @@ -34,7 +34,7 @@ msgid "No End of year journal defined for the fiscal year" msgstr "" #. module: account -#: code:addons/account/account.py:506 +#: code:addons/account/account.py:516 #, python-format msgid "" "You cannot remove/deactivate an account which is set as a property to any " @@ -66,7 +66,7 @@ msgid "Residual" msgstr "" #. module: account -#: code:addons/account/invoice.py:785 +#: code:addons/account/invoice.py:793 #, python-format msgid "Please define sequence on invoice journal" msgstr "" @@ -131,7 +131,7 @@ msgid "Accounting Entries-" msgstr "" #. module: account -#: code:addons/account/account.py:1291 +#: code:addons/account/account.py:1305 #, python-format msgid "You can not delete posted movement: \"%s\"!" msgstr "" @@ -175,7 +175,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/invoice.py:1421 +#: code:addons/account/invoice.py:1436 #, python-format msgid "Warning!" msgstr "" @@ -227,7 +227,7 @@ msgid "account.tax" msgstr "" #. module: account -#: code:addons/account/account.py:901 +#: code:addons/account/account.py:915 #, python-format msgid "" "No period defined for this date: %s !\n" @@ -255,7 +255,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/invoice.py:1210 +#: code:addons/account/invoice.py:1224 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" msgstr "" @@ -271,7 +271,7 @@ msgid "Belgian Reports" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1176 +#: code:addons/account/account_move_line.py:1182 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "" @@ -309,7 +309,7 @@ msgid "St." msgstr "" #. module: account -#: code:addons/account/invoice.py:529 +#: code:addons/account/invoice.py:532 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "" @@ -551,7 +551,7 @@ msgid "Not reconciled transactions" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:348 +#: code:addons/account/account_cash_statement.py:349 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" msgstr "" @@ -633,7 +633,7 @@ msgid "Tax Code Amount" msgstr "" #. module: account -#: code:addons/account/account.py:2779 +#: code:addons/account/account.py:2823 #: code:addons/account/installer.py:434 #, python-format msgid "SAJ" @@ -666,8 +666,8 @@ msgid "Journal Period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "" @@ -728,7 +728,7 @@ msgid "Analytic Entries by line" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:39 +#: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice !" msgstr "" @@ -829,7 +829,7 @@ msgid "Next Partner to reconcile" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1191 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "" "You can not do this modification on a confirmed entry ! Please note that you " @@ -951,11 +951,11 @@ msgid "Code" msgstr "" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 +#: code:addons/account/account_move_line.py:169 #: code:addons/account/invoice.py:73 -#: code:addons/account/invoice.py:670 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "No Analytic Journal !" @@ -1034,7 +1034,6 @@ msgstr "" #. module: account #: report:account.analytic.account.journal:0 -#: report:account.move.voucher:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "-" @@ -1120,6 +1119,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1127,7 +1127,7 @@ msgid "Entry Label" msgstr "" #. module: account -#: code:addons/account/account.py:976 +#: code:addons/account/account.py:990 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "" @@ -1265,7 +1265,6 @@ msgid "Journal Items Analysis" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_partner_all #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "" @@ -1295,7 +1294,7 @@ msgid "Central Journal" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "You can not use this general account in this journal !" msgstr "" @@ -1388,7 +1387,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/invoice.py:815 +#: code:addons/account/invoice.py:823 #, python-format msgid "" "Cannot create the invoice !\n" @@ -1547,7 +1546,6 @@ msgid "Separated Journal Sequences" msgstr "" #. module: account -#: field:account.bank.statement,user_id:0 #: view:account.invoice:0 msgid "Responsible" msgstr "" @@ -1614,7 +1612,7 @@ msgid "Error! You cannot define overlapping fiscal years" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:799 #, python-format msgid "The account is not defined to be reconciled !" msgstr "" @@ -1647,7 +1645,7 @@ msgid "Receivables & Payables" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:806 #, python-format msgid "You have to provide an account for the write off entry !" msgstr "" @@ -1683,7 +1681,7 @@ msgid "Customer Ref:" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:328 +#: code:addons/account/account_cash_statement.py:329 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "" @@ -1704,7 +1702,7 @@ msgid "Tax Declaration: Credit Notes" msgstr "" #. module: account -#: code:addons/account/account.py:499 +#: code:addons/account/account.py:509 #, python-format msgid "You cannot deactivate an account that contains account moves." msgstr "" @@ -1720,7 +1718,7 @@ msgid "You can not create move line on closed account." msgstr "" #. module: account -#: code:addons/account/account.py:519 +#: code:addons/account/account.py:529 #, python-format msgid "" "You cannot change the type of account from 'Closed' to any other type which " @@ -1989,7 +1987,7 @@ msgid " Journal" msgstr "" #. module: account -#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1333 #, python-format msgid "" "There is no default default debit account defined \n" @@ -2041,7 +2039,7 @@ msgid "Description" msgstr "" #. module: account -#: code:addons/account/account.py:2844 +#: code:addons/account/account.py:2888 #: code:addons/account/installer.py:498 #, python-format msgid "ECNJ" @@ -2061,7 +2059,7 @@ msgid "Income Account" msgstr "" #. module: account -#: code:addons/account/invoice.py:352 +#: code:addons/account/invoice.py:351 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "" @@ -2072,6 +2070,7 @@ msgid "Accounting Properties" msgstr "" #. module: account +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 msgid "Entries Sorted By" @@ -2100,6 +2099,7 @@ msgstr "" #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2208,7 +2208,7 @@ msgid "Account Tax Code" msgstr "" #. module: account -#: code:addons/account/invoice.py:545 +#: code:addons/account/invoice.py:552 #, python-format msgid "" "Can't find any account journal of %s type for this company.\n" @@ -2278,7 +2278,7 @@ msgid "Account Model Entries" msgstr "" #. module: account -#: code:addons/account/account.py:2796 +#: code:addons/account/account.py:2840 #: code:addons/account/installer.py:454 #, python-format msgid "EXJ" @@ -2362,7 +2362,7 @@ msgid "Accounts" msgstr "" #. module: account -#: code:addons/account/invoice.py:351 +#: code:addons/account/invoice.py:350 #, python-format msgid "Configuration Error!" msgstr "" @@ -2374,13 +2374,12 @@ msgid "Average Price" msgstr "" #. module: account -#: report:account.move.voucher:0 #: report:account.overdue:0 msgid "Date:" msgstr "" #. module: account -#: code:addons/account/account.py:640 +#: code:addons/account/account.py:654 #, python-format msgid "" "You cannot modify company of this journal as its related record exist in " @@ -2416,6 +2415,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2524,16 +2524,16 @@ msgid "This wizard will create recurring accounting entries" msgstr "" #. module: account -#: code:addons/account/account.py:1181 +#: code:addons/account/account.py:1195 #, python-format msgid "No sequence defined on the journal !" msgstr "" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 -#: code:addons/account/invoice.py:670 +#: code:addons/account/account_move_line.py:169 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" @@ -2693,7 +2693,7 @@ msgid "Analytic Entries" msgstr "" #. module: account -#: code:addons/account/account.py:822 +#: code:addons/account/account.py:836 #, python-format msgid "" "No fiscal year defined for this date !\n" @@ -2816,7 +2816,7 @@ msgid "BNK%s" msgstr "" #. module: account -#: code:addons/account/account.py:2906 +#: code:addons/account/account.py:2950 #: code:addons/account/installer.py:296 #, python-format msgid "BNK" @@ -2925,6 +2925,7 @@ msgstr "" #: field:account.common.report,journal_ids:0 #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 +#: report:account.general.ledger_landscape:0 #: view:account.journal.period:0 #: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 @@ -2985,7 +2986,7 @@ msgid "Starting Balance" msgstr "" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "No Partner Defined !" msgstr "" @@ -3027,7 +3028,6 @@ msgstr "" #: view:account.invoice.report:0 #: selection:account.invoice.report,state:0 #: selection:account.journal.period,state:0 -#: report:account.move.voucher:0 #: view:account.subscription:0 #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 @@ -3079,7 +3079,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Cannot delete invoice(s) that are already opened or paid !" msgstr "" @@ -3140,7 +3140,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:532 #, python-format msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " @@ -3149,6 +3149,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" msgstr "" @@ -3251,6 +3252,7 @@ msgstr "" #: field:account.entries.report,date:0 #: selection:account.general.journal,filter:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice.report,date:0 #: report:account.journal.period.print:0 #: view:account.move:0 @@ -3294,7 +3296,7 @@ msgid "Chart of Accounts Template" msgstr "" #. module: account -#: code:addons/account/account.py:2095 +#: code:addons/account/account.py:2109 #, python-format msgid "" "Maturity date of entry line generated by model line '%s' of model '%s' is " @@ -3303,13 +3305,13 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:810 +#: code:addons/account/account_move_line.py:801 #, python-format msgid "Some entries are already reconciled !" msgstr "" #. module: account -#: code:addons/account/account.py:1204 +#: code:addons/account/account.py:1218 #, python-format msgid "" "You cannot validate a Journal Entry unless all journal items are in same " @@ -3429,7 +3431,7 @@ msgid "Analytic Items" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "Unable to change tax !" msgstr "" @@ -3440,14 +3442,14 @@ msgid "#Entries" msgstr "" #. module: account -#: code:addons/account/invoice.py:1422 +#: code:addons/account/invoice.py:1437 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." msgstr "" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #, python-format msgid "" "The Payment Term of Supplier does not have Payment Term Lines(Computation) " @@ -3741,7 +3743,7 @@ msgid "Acc.Type" msgstr "" #. module: account -#: code:addons/account/invoice.py:714 +#: code:addons/account/invoice.py:722 #, python-format msgid "Global taxes defined, but are not in invoice lines !" msgstr "" @@ -3800,7 +3802,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:91 +#: code:addons/account/account_analytic_line.py:90 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -3975,7 +3977,7 @@ msgid "Credit Notes" msgstr "" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "Unable to find a valid period !" @@ -4046,11 +4048,11 @@ msgid "Change" msgstr "" #. module: account -#: code:addons/account/account.py:1290 -#: code:addons/account/account.py:1318 -#: code:addons/account/account.py:1325 -#: code:addons/account/account_move_line.py:1055 -#: code:addons/account/invoice.py:896 +#: code:addons/account/account.py:1304 +#: code:addons/account/account.py:1332 +#: code:addons/account/account.py:1339 +#: code:addons/account/account_move_line.py:1061 +#: code:addons/account/invoice.py:904 #: code:addons/account/wizard/account_automatic_reconcile.py:152 #: code:addons/account/wizard/account_fiscalyear_close.py:78 #: code:addons/account/wizard/account_fiscalyear_close.py:81 @@ -4154,7 +4156,7 @@ msgid "You must define an analytic journal of type '%s' !" msgstr "" #. module: account -#: code:addons/account/account.py:1397 +#: code:addons/account/account.py:1411 #, python-format msgid "" "Couldn't create move with currency different from the secondary currency of " @@ -4219,7 +4221,7 @@ msgid "Invoices" msgstr "" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "" "Please verify the price of the invoice !\n" @@ -4331,25 +4333,24 @@ msgid "Third Party (Country)" msgstr "" #. module: account -#: code:addons/account/account.py:938 -#: code:addons/account/account.py:940 -#: code:addons/account/account.py:1181 -#: code:addons/account/account.py:1393 -#: code:addons/account/account.py:1397 -#: code:addons/account/account_cash_statement.py:249 -#: code:addons/account/account_move_line.py:780 -#: code:addons/account/account_move_line.py:803 -#: code:addons/account/account_move_line.py:805 -#: code:addons/account/account_move_line.py:808 -#: code:addons/account/account_move_line.py:810 -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account.py:952 +#: code:addons/account/account.py:954 +#: code:addons/account/account.py:1195 +#: code:addons/account/account.py:1407 +#: code:addons/account/account.py:1411 +#: code:addons/account/account_cash_statement.py:250 +#: code:addons/account/account_move_line.py:771 +#: code:addons/account/account_move_line.py:794 +#: code:addons/account/account_move_line.py:796 +#: code:addons/account/account_move_line.py:799 +#: code:addons/account/account_move_line.py:801 +#: code:addons/account/account_move_line.py:1123 #: code:addons/account/report/common_report_header.py:92 -#: code:addons/account/wizard/account_change_currency.py:39 -#: code:addons/account/wizard/account_change_currency.py:60 -#: code:addons/account/wizard/account_change_currency.py:65 -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:38 +#: code:addons/account/wizard/account_change_currency.py:59 +#: code:addons/account/wizard/account_change_currency.py:64 +#: code:addons/account/wizard/account_change_currency.py:70 #: code:addons/account/wizard/account_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_report_common.py:120 #: code:addons/account/wizard/account_report_common.py:126 #, python-format @@ -4371,7 +4372,7 @@ msgid "Bank Details" msgstr "" #. module: account -#: code:addons/account/invoice.py:720 +#: code:addons/account/invoice.py:728 #, python-format msgid "Taxes missing !" msgstr "" @@ -4426,7 +4427,7 @@ msgid "Check Date not in the Period" msgstr "" #. module: account -#: code:addons/account/account.py:1210 +#: code:addons/account/account.py:1224 #, python-format msgid "" "You can not modify a posted entry of this journal !\n" @@ -4445,7 +4446,7 @@ msgid "Child Tax Accounts" msgstr "" #. module: account -#: code:addons/account/account.py:940 +#: code:addons/account/account.py:954 #, python-format msgid "Start period should be smaller then End period" msgstr "" @@ -4475,6 +4476,7 @@ msgstr "" #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 #: report:account.partner.balance:0 @@ -4557,7 +4559,7 @@ msgid "Line 1:" msgstr "" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "Integrity Error !" msgstr "" @@ -4703,7 +4705,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "No period found !" @@ -4775,7 +4777,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:2896 +#: code:addons/account/account.py:2940 #: code:addons/account/installer.py:283 #: code:addons/account/installer.py:295 #, python-format @@ -4803,7 +4805,7 @@ msgid "Start of period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1193 +#: code:addons/account/account_move_line.py:1199 #, python-format msgid "" "You can not do this modification on a reconciled entry ! Please note that " @@ -4859,12 +4861,12 @@ msgstr "" #. module: account #: code:addons/account/account_bank_statement.py:331 -#: code:addons/account/invoice.py:405 -#: code:addons/account/invoice.py:505 -#: code:addons/account/invoice.py:520 -#: code:addons/account/invoice.py:528 -#: code:addons/account/invoice.py:545 -#: code:addons/account/invoice.py:1347 +#: code:addons/account/invoice.py:408 +#: code:addons/account/invoice.py:508 +#: code:addons/account/invoice.py:523 +#: code:addons/account/invoice.py:531 +#: code:addons/account/invoice.py:552 +#: code:addons/account/invoice.py:1361 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" @@ -4941,7 +4943,7 @@ msgid "Sort By" msgstr "" #. module: account -#: code:addons/account/account.py:1326 +#: code:addons/account/account.py:1340 #, python-format msgid "" "There is no default default credit account defined \n" @@ -5088,7 +5090,7 @@ msgid "Generate Opening Entries" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:738 +#: code:addons/account/account_move_line.py:729 #, python-format msgid "Already Reconciled!" msgstr "" @@ -5124,7 +5126,7 @@ msgstr "" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:830 +#: code:addons/account/account_move_line.py:821 #, python-format msgid "Write-Off" msgstr "" @@ -5261,7 +5263,7 @@ msgid "# of Lines" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:60 +#: code:addons/account/wizard/account_change_currency.py:59 #, python-format msgid "New currency is not confirured properly !" msgstr "" @@ -5286,14 +5288,14 @@ msgid "Filter by" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "You can not use an inactive account!" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:794 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "" @@ -5328,7 +5330,7 @@ msgstr "" #. module: account #: code:addons/account/account_bank_statement.py:391 -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Invalid action !" msgstr "" @@ -5539,7 +5541,7 @@ msgid "Companies" msgstr "" #. module: account -#: code:addons/account/account.py:532 +#: code:addons/account/account.py:546 #, python-format msgid "" "You cannot modify Company of account as its related record exist in Entry " @@ -5805,9 +5807,9 @@ msgid "Optional create" msgstr "" #. module: account -#: code:addons/account/invoice.py:406 -#: code:addons/account/invoice.py:506 -#: code:addons/account/invoice.py:1348 +#: code:addons/account/invoice.py:409 +#: code:addons/account/invoice.py:509 +#: code:addons/account/invoice.py:1362 #, python-format msgid "Can not find account chart for this company, Please Create account." msgstr "" @@ -5956,8 +5958,8 @@ msgid "Analytic Entries Statistics" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:143 -#: code:addons/account/account_move_line.py:905 +#: code:addons/account/account_analytic_line.py:141 +#: code:addons/account/account_move_line.py:897 #, python-format msgid "Entries: " msgstr "" @@ -5968,7 +5970,7 @@ msgid "Create manual recurring entries in a chosen journal." msgstr "" #. module: account -#: code:addons/account/account.py:1393 +#: code:addons/account/account.py:1407 #, python-format msgid "Couldn't create move between different companies" msgstr "" @@ -6006,7 +6008,7 @@ msgid "Total debit" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:781 +#: code:addons/account/account_move_line.py:772 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "" @@ -6070,30 +6072,31 @@ msgid " valuation: percent" msgstr "" #. module: account -#: code:addons/account/account.py:499 -#: code:addons/account/account.py:501 -#: code:addons/account/account.py:822 -#: code:addons/account/account.py:901 -#: code:addons/account/account.py:976 -#: code:addons/account/account.py:1204 -#: code:addons/account/account.py:1210 -#: code:addons/account/account.py:2095 -#: code:addons/account/account.py:2333 -#: code:addons/account/account_analytic_line.py:90 -#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account.py:509 +#: code:addons/account/account.py:511 +#: code:addons/account/account.py:836 +#: code:addons/account/account.py:915 +#: code:addons/account/account.py:990 +#: code:addons/account/account.py:1218 +#: code:addons/account/account.py:1224 +#: code:addons/account/account.py:2109 +#: code:addons/account/account.py:2357 +#: code:addons/account/account_analytic_line.py:89 +#: code:addons/account/account_analytic_line.py:98 #: code:addons/account/account_bank_statement.py:292 #: code:addons/account/account_bank_statement.py:305 #: code:addons/account/account_bank_statement.py:345 -#: code:addons/account/account_cash_statement.py:328 -#: code:addons/account/account_cash_statement.py:348 -#: code:addons/account/account_move_line.py:1176 -#: code:addons/account/account_move_line.py:1191 -#: code:addons/account/account_move_line.py:1193 -#: code:addons/account/invoice.py:785 -#: code:addons/account/invoice.py:815 -#: code:addons/account/invoice.py:1008 +#: code:addons/account/account_cash_statement.py:329 +#: code:addons/account/account_cash_statement.py:349 +#: code:addons/account/account_move_line.py:1182 +#: code:addons/account/account_move_line.py:1197 +#: code:addons/account/account_move_line.py:1199 +#: code:addons/account/invoice.py:793 +#: code:addons/account/invoice.py:823 +#: code:addons/account/invoice.py:1014 #: code:addons/account/wizard/account_invoice_refund.py:100 #: code:addons/account/wizard/account_invoice_refund.py:102 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" @@ -6203,7 +6206,7 @@ msgid "Journal Select" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:65 +#: code:addons/account/wizard/account_change_currency.py:64 #, python-format msgid "Currnt currency is not confirured properly !" msgstr "" @@ -6220,9 +6223,11 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger +#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" msgstr "" @@ -6276,7 +6281,7 @@ msgid "Total:" msgstr "" #. module: account -#: code:addons/account/account.py:2050 +#: code:addons/account/account.py:2064 #, python-format msgid "" "You can specify year, month and date in the name of the model using the " @@ -6306,7 +6311,7 @@ msgid "Child Codes" msgstr "" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #: code:addons/account/wizard/account_invoice_refund.py:137 #, python-format msgid "Data Insufficient !" @@ -6463,7 +6468,7 @@ msgid "Lines" msgstr "" #. module: account -#: code:addons/account/invoice.py:521 +#: code:addons/account/invoice.py:524 #, python-format msgid "" "Can not find account chart for this company in invoice line account, Please " @@ -6631,7 +6636,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:938 +#: code:addons/account/account.py:952 #, python-format msgid "You should have chosen periods that belongs to the same company" msgstr "" @@ -6735,7 +6740,7 @@ msgid "Sign on Reports" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:249 +#: code:addons/account/account_cash_statement.py:250 #, python-format msgid "You can not have two open register for the same journal" msgstr "" @@ -6764,7 +6769,6 @@ msgstr "" #. module: account #: report:account.invoice:0 #: view:account.invoice:0 -#: report:account.move.voucher:0 msgid "PRO-FORMA" msgstr "" @@ -6794,6 +6798,7 @@ msgstr "" #. module: account #: view:account.analytic.line:0 +#: field:account.bank.statement,user_id:0 #: view:account.journal:0 #: field:account.journal,user_id:0 #: view:analytic.entries.report:0 @@ -6819,13 +6824,13 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "Bad account !" msgstr "" #. module: account -#: code:addons/account/account.py:2777 +#: code:addons/account/account.py:2821 #: code:addons/account/installer.py:432 #, python-format msgid "Sales Journal" @@ -6843,7 +6848,7 @@ msgid "Invoice Tax" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "No piece number !" msgstr "" @@ -7077,17 +7082,17 @@ msgid "Fixed" msgstr "" #. module: account -#: code:addons/account/account.py:506 -#: code:addons/account/account.py:519 -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:516 +#: code:addons/account/account.py:529 #: code:addons/account/account.py:532 -#: code:addons/account/account.py:640 -#: code:addons/account/account.py:927 -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 -#: code:addons/account/invoice.py:714 -#: code:addons/account/invoice.py:717 -#: code:addons/account/invoice.py:720 +#: code:addons/account/account.py:546 +#: code:addons/account/account.py:654 +#: code:addons/account/account.py:941 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/invoice.py:722 +#: code:addons/account/invoice.py:725 +#: code:addons/account/invoice.py:728 #, python-format msgid "Warning !" msgstr "" @@ -7119,6 +7124,7 @@ msgstr "" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7149,7 +7155,7 @@ msgid "Can not %s draft/proforma/cancel invoice." msgstr "" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "No Invoice Lines !" msgstr "" @@ -7198,7 +7204,7 @@ msgid "Deferral Method" msgstr "" #. module: account -#: code:addons/account/invoice.py:359 +#: code:addons/account/invoice.py:360 #, python-format msgid "Invoice '%s' is paid." msgstr "" @@ -7259,7 +7265,7 @@ msgid "Associated Partner" msgstr "" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "You must first select a partner !" msgstr "" @@ -7324,7 +7330,7 @@ msgid "Choose Fiscal Year" msgstr "" #. module: account -#: code:addons/account/account.py:2841 +#: code:addons/account/account.py:2885 #: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" @@ -7359,6 +7365,7 @@ msgstr "" #: view:account.entries.report:0 #: field:account.entries.report,period_id:0 #: view:account.fiscalyear:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: view:account.invoice.report:0 #: field:account.journal.period,period_id:0 @@ -7521,7 +7528,7 @@ msgid "Account Types" msgstr "" #. module: account -#: code:addons/account/invoice.py:897 +#: code:addons/account/invoice.py:905 #, python-format msgid "Cannot create invoice move on centralised journal" msgstr "" @@ -7571,6 +7578,7 @@ msgstr "" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 +#: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 msgid "Filter By" msgstr "" @@ -7609,7 +7617,7 @@ msgid "Payment Term Line" msgstr "" #. module: account -#: code:addons/account/account.py:2794 +#: code:addons/account/account.py:2838 #: code:addons/account/installer.py:452 #, python-format msgid "Purchase Journal" @@ -7776,8 +7784,8 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "Bad account!" msgstr "" @@ -7788,7 +7796,7 @@ msgid "Keep empty for all open fiscal years" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1056 +#: code:addons/account/account_move_line.py:1062 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" msgstr "" @@ -7809,6 +7817,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -7981,14 +7990,14 @@ msgid "Period from" msgstr "" #. module: account -#: code:addons/account/account.py:2817 +#: code:addons/account/account.py:2861 #: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" msgstr "" #. module: account -#: code:addons/account/account.py:927 +#: code:addons/account/account.py:941 #, python-format msgid "" "You cannot modify company of this period as its related record exist in " @@ -8037,7 +8046,7 @@ msgid "Purchase Tax(%)" msgstr "" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "Please create some invoice lines." msgstr "" @@ -8053,7 +8062,7 @@ msgid "Configure Your Accounting Application" msgstr "" #. module: account -#: code:addons/account/account.py:2820 +#: code:addons/account/account.py:2864 #: code:addons/account/installer.py:479 #, python-format msgid "SCNJ" @@ -8091,6 +8100,7 @@ msgstr "" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8100,7 +8110,7 @@ msgid "Start Period" msgstr "" #. module: account -#: code:addons/account/account.py:2333 +#: code:addons/account/account.py:2357 #, python-format msgid "Cannot locate parent code for template account!" msgstr "" @@ -8137,7 +8147,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. " msgstr "" #. module: account -#: code:addons/account/invoice.py:1008 +#: code:addons/account/invoice.py:1014 #, python-format msgid "" "You cannot cancel the Invoice which is Partially Paid! You need to " @@ -8165,7 +8175,7 @@ msgid "You can not create move line on view account." msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not confirured properly !" msgstr "" @@ -8214,6 +8224,7 @@ msgstr "" #: field:account.entries.report,balance:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8232,6 +8243,7 @@ msgstr "" #. module: account #: report:account.account.balance:0 +#: report:account.general.ledger_landscape:0 msgid "Display Account" msgstr "" @@ -8346,6 +8358,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.line,move_id:0 #: field:analytic.entries.report,move_id:0 @@ -8353,7 +8366,7 @@ msgid "Move" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "" @@ -8447,6 +8460,7 @@ msgstr "" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8490,7 +8504,7 @@ msgid "Account Subscription" msgstr "" #. module: account -#: code:addons/account/invoice.py:717 +#: code:addons/account/invoice.py:725 #, python-format msgid "" "Tax base different !\n" @@ -8517,6 +8531,7 @@ msgstr "" #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_start:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -8545,7 +8560,7 @@ msgid "Unreconciled" msgstr "" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "Bad total !" msgstr "" @@ -8603,13 +8618,13 @@ msgid "Active" msgstr "" #. module: account -#: code:addons/account/invoice.py:354 +#: code:addons/account/invoice.py:353 #, python-format msgid "Unknown Error" msgstr "" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "" "You cannot validate a non-balanced entry !\n" @@ -8652,10 +8667,10 @@ msgstr "" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -8891,7 +8906,6 @@ msgstr "" #: view:account.move:0 #: selection:account.move,state:0 #: view:account.move.line:0 -#: report:account.move.voucher:0 msgid "Posted" msgstr "" @@ -8910,6 +8924,7 @@ msgstr "" #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_stop:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -8963,7 +8978,7 @@ msgid "This is a model for recurring accounting entries" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:100 +#: code:addons/account/account_analytic_line.py:99 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -9113,8 +9128,8 @@ msgid "End period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:738 -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:729 +#: code:addons/account/account_move_line.py:806 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_report_balance_sheet.py:70 @@ -9180,10 +9195,10 @@ msgstr "" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9217,7 +9232,7 @@ msgid "Recurring" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:805 +#: code:addons/account/account_move_line.py:796 #, python-format msgid "Entry is already reconciled" msgstr "" @@ -9238,7 +9253,7 @@ msgid "Range" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "" "Can not create an automatic sequence for this piece !\n" @@ -9368,7 +9383,7 @@ msgid "Accounts Mapping" msgstr "" #. module: account -#: code:addons/account/invoice.py:346 +#: code:addons/account/invoice.py:345 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "" @@ -9393,7 +9408,7 @@ msgid "The income or expense account related to the selected product." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1123 #, python-format msgid "The date of your Journal Entry is not in the defined period!" msgstr "" @@ -9598,7 +9613,7 @@ msgid "You must enter a period length that cannot be 0 or below !" msgstr "" #. module: account -#: code:addons/account/account.py:501 +#: code:addons/account/account.py:511 #, python-format msgid "You cannot remove an account which has account entries!. " msgstr "" diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index f1c1a881d02..54d763a6b69 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-04 19:28+0000\n" +"PO-Revision-Date: 2011-06-06 09:30+0000\n" "Last-Translator: Phong Nguyen-Thanh \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-05 04:39+0000\n" +"X-Launchpad-Export-Date: 2011-06-07 04:35+0000\n" "X-Generator: Launchpad (build 12959)\n" #. module: account @@ -34,7 +34,7 @@ msgid "No End of year journal defined for the fiscal year" msgstr "Chưa xác định thời điểm kết thúc năm tài chính" #. module: account -#: code:addons/account/account.py:506 +#: code:addons/account/account.py:516 #, python-format msgid "" "You cannot remove/deactivate an account which is set as a property to any " @@ -47,6 +47,8 @@ msgstr "" #: view:account.move.reconcile:0 msgid "Journal Entry Reconcile" msgstr "" +"Thuế GTGT này không có vẻ là chính xác. Bạn cần phải có một cái gì đó nhập " +"như% s này" #. module: account #: field:account.installer.modules,account_voucher:0 @@ -68,10 +70,10 @@ msgid "Residual" msgstr "Còn lại" #. module: account -#: code:addons/account/invoice.py:785 +#: code:addons/account/invoice.py:793 #, python-format msgid "Please define sequence on invoice journal" -msgstr "" +msgstr "làm ơn định nghĩa cấu hình đường đi và tần suất của hóa đơn" #. module: account #: constraint:account.period:0 @@ -137,7 +139,7 @@ msgid "Accounting Entries-" msgstr "Các bút toán Kế toán-" #. module: account -#: code:addons/account/account.py:1291 +#: code:addons/account/account.py:1305 #, python-format msgid "You can not delete posted movement: \"%s\"!" msgstr "Bạn không thể xóa bút toán \"%s\" mà đã được ghi nhận trước đó!" @@ -179,9 +181,11 @@ msgid "" "If the active field is set to False, it will allow you to hide the payment " "term without removing it." msgstr "" +"Nếu lĩnh vực hoạt động được thiết lập để sai, nó sẽ cho phép bạn ẩn các hạn " +"thanh toán mà không cần loại bỏ nó." #. module: account -#: code:addons/account/invoice.py:1421 +#: code:addons/account/invoice.py:1436 #, python-format msgid "Warning!" msgstr "Cảnh báo!" @@ -236,7 +240,7 @@ msgid "account.tax" msgstr "account.tax" #. module: account -#: code:addons/account/account.py:901 +#: code:addons/account/account.py:915 #, python-format msgid "" "No period defined for this date: %s !\n" @@ -270,7 +274,7 @@ msgstr "" "on invoices" #. module: account -#: code:addons/account/invoice.py:1210 +#: code:addons/account/invoice.py:1224 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" msgstr "" @@ -287,7 +291,7 @@ msgid "Belgian Reports" msgstr "Báo cáo của Bỉ" #. module: account -#: code:addons/account/account_move_line.py:1176 +#: code:addons/account/account_move_line.py:1182 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "You can not add/modify entries in a closed journal." @@ -325,7 +329,7 @@ msgid "St." msgstr "St." #. module: account -#: code:addons/account/invoice.py:529 +#: code:addons/account/invoice.py:532 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "Invoice line account company does not match with invoice company." @@ -585,7 +589,7 @@ msgid "Not reconciled transactions" msgstr "Các giao dịch chưa đối soát" #. module: account -#: code:addons/account/account_cash_statement.py:348 +#: code:addons/account/account_cash_statement.py:349 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" msgstr "CashBox Balance is not matching with Calculated Balance !" @@ -661,7 +665,7 @@ msgstr "Sổ nhật ký tập trung" #. module: account #: sql_constraint:account.sequence.fiscalyear:0 msgid "Main Sequence must be different from current !" -msgstr "" +msgstr "trình tự chính phải khác với các hiện tại" #. module: account #: field:account.invoice.tax,tax_amount:0 @@ -669,7 +673,7 @@ msgid "Tax Code Amount" msgstr "Tax Code Amount" #. module: account -#: code:addons/account/account.py:2779 +#: code:addons/account/account.py:2823 #: code:addons/account/installer.py:434 #, python-format msgid "SAJ" @@ -702,8 +706,8 @@ msgid "Journal Period" msgstr "Chu kỳ của Sổ nhật ký" #. module: account -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "To reconcile the entries company should be the same for all entries" @@ -764,7 +768,7 @@ msgid "Analytic Entries by line" msgstr "Analytic Entries by line" #. module: account -#: code:addons/account/wizard/account_change_currency.py:39 +#: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice !" msgstr "Bạn chỉ có thể thay đổi loại tiền cho Hóa đơn Nháp" @@ -868,7 +872,7 @@ msgid "Next Partner to reconcile" msgstr "Đối tác tiếp theo cho đối soát" #. module: account -#: code:addons/account/account_move_line.py:1191 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "" "You can not do this modification on a confirmed entry ! Please note that you " @@ -995,11 +999,11 @@ msgid "Code" msgstr "Mã" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 +#: code:addons/account/account_move_line.py:169 #: code:addons/account/invoice.py:73 -#: code:addons/account/invoice.py:670 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "No Analytic Journal !" @@ -1080,7 +1084,6 @@ msgstr "Profit & Loss (Expense Accounts)" #. module: account #: report:account.analytic.account.journal:0 -#: report:account.move.voucher:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "-" @@ -1094,7 +1097,7 @@ msgstr "Quản lý" #. module: account #: view:account.subscription.generate:0 msgid "Generate Entries before:" -msgstr "" +msgstr "Tạo ra các mục trước:" #. module: account #: selection:account.bank.accounts.wizard,account_type:0 @@ -1130,6 +1133,10 @@ msgid "" "purchase orders or receipts. This way, you can control the invoice from your " "supplier according to what you purchased or received." msgstr "" +"Với hóa đơn cung cấp bạn có thể nhập và quản lý hoá đơn do nhà cung cấp của " +"bạn. OpenERP cũng có thể tạo ra hóa đơn dự thảo tự động từ các đơn đặt hàng " +"mua hàng hoặc biên lai. Bằng cách này, bạn có thể kiểm soát các hóa đơn từ " +"nhà cung cấp của bạn theo những gì bạn mua hay nhận được." #. module: account #: view:account.invoice.cancel:0 @@ -1166,6 +1173,7 @@ msgstr "Số lượng giao dịch" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1173,7 +1181,7 @@ msgid "Entry Label" msgstr "Entry Label" #. module: account -#: code:addons/account/account.py:976 +#: code:addons/account/account.py:990 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "You can not modify/delete a journal with entries for this period !" @@ -1311,7 +1319,6 @@ msgid "Journal Items Analysis" msgstr "Journal Items Analysis" #. module: account -#: model:ir.actions.act_window,name:account.action_partner_all #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "Các đối tác" @@ -1338,10 +1345,10 @@ msgstr "Khoản phải thu" #. module: account #: model:ir.actions.report.xml,name:account.account_central_journal msgid "Central Journal" -msgstr "" +msgstr "quy trình trung tâm" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "You can not use this general account in this journal !" msgstr "You can not use this general account in this journal !" @@ -1410,6 +1417,10 @@ msgid "" "entry per accounting document: invoice, refund, supplier payment, bank " "statements, etc." msgstr "" +"Một mục tạp chí bao gồm các hạng mục một số tạp chí, mỗi trong số đó là cả " +"một thẻ ghi nợ hoặc giao dịch tín dụng. OpenERP tự động tạo ra một mục tạp " +"chí mỗi kế toán tài liệu: hóa đơn, hoàn thuế, thanh toán nhà cung cấp, báo " +"cáo ngân hàng, etc" #. module: account #: view:account.entries.report:0 @@ -1435,7 +1446,7 @@ msgstr "" "Example: at 14 net days 2 percents, remaining amount at 30 days end of month." #. module: account -#: code:addons/account/invoice.py:815 +#: code:addons/account/invoice.py:823 #, python-format msgid "" "Cannot create the invoice !\n" @@ -1475,7 +1486,7 @@ msgstr "Template for Fiscal Position" #. module: account #: model:account.tax.code,name:account.account_tax_code_0 msgid "Tax Code Test" -msgstr "" +msgstr "mã thuế kiểm tra" #. module: account #: field:account.automatic.reconcile,reconciled:0 @@ -1523,6 +1534,7 @@ msgstr "Search Bank Statements" msgid "" "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!" msgstr "" +"báo có và váo nợ sai giá (báo có và báo nợ bắt buộc bắt đầu từ \"0\")" #. module: account #: view:account.chart.template:0 @@ -1552,6 +1564,12 @@ msgid "" "the Payment column of a line, you can press F1 to open the reconciliation " "form." msgstr "" +"Một thông cáo của ngân hàng là một bản tóm tắt của tất cả các giao dịch tài " +"chính xảy ra trong một thời gian nhất định trên tài khoản tiền gửi, thẻ tín " +"dụng hoặc loại nào khác của tài khoản tài chính. Sự cân bằng sẽ bắt đầu được " +"đề xuất tự động và số dư đóng cửa là để được tìm thấy trên báo cáo của bạn. " +"Khi bạn đang ở trong cột Thanh toán của một dòng, bạn có thể nhấn F1 để mở " +"hình thức hoà giải." #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -1597,7 +1615,6 @@ msgid "Separated Journal Sequences" msgstr "Separated Journal Sequences" #. module: account -#: field:account.bank.statement,user_id:0 #: view:account.invoice:0 msgid "Responsible" msgstr "Chịu trách nhiệm" @@ -1669,7 +1686,7 @@ msgid "Error! You cannot define overlapping fiscal years" msgstr "Lỗi! Bạn không thể định nghĩa các năm tài chính chồng nhau" #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:799 #, python-format msgid "The account is not defined to be reconciled !" msgstr "Tài khoản không được định nghĩa để đối soát !" @@ -1684,7 +1701,7 @@ msgstr "Các giá trị" msgid "" "If the active field is set to False, it will allow you to hide the journal " "period without removing it." -msgstr "" +msgstr "nếu thiết lập này bị sai. bạn có thể ẩn nó thay vì xóa nó." #. module: account #: view:res.partner:0 @@ -1702,7 +1719,7 @@ msgid "Receivables & Payables" msgstr "Khoản phải thu & Khoản phải trả" #. module: account -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:806 #, python-format msgid "You have to provide an account for the write off entry !" msgstr "You have to provide an account for the write off entry !" @@ -1738,7 +1755,7 @@ msgid "Customer Ref:" msgstr "Tham chiếu khách hàng:" #. module: account -#: code:addons/account/account_cash_statement.py:328 +#: code:addons/account/account_cash_statement.py:329 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "User %s does not have rights to access %s journal !" @@ -1759,7 +1776,7 @@ msgid "Tax Declaration: Credit Notes" msgstr "Tax Declaration: Credit Notes" #. module: account -#: code:addons/account/account.py:499 +#: code:addons/account/account.py:509 #, python-format msgid "You cannot deactivate an account that contains account moves." msgstr "You cannot deactivate an account that contains account moves." @@ -1772,10 +1789,10 @@ msgstr "Credit amount" #. module: account #: constraint:account.move.line:0 msgid "You can not create move line on closed account." -msgstr "" +msgstr "bạn không thể xóa hay di chuyển dòng này vì tài khoản đã đóng." #. module: account -#: code:addons/account/account.py:519 +#: code:addons/account/account.py:529 #, python-format msgid "" "You cannot change the type of account from 'Closed' to any other type which " @@ -1792,7 +1809,7 @@ msgstr "Reserve And Profit/Loss Account" #. module: account #: sql_constraint:account.move.line:0 msgid "Wrong credit or debit value in accounting entry !" -msgstr "" +msgstr "báo nợ hay báo có bị sai trong tài khoản kế toán." #. module: account #: view:account.invoice.report:0 @@ -1958,7 +1975,7 @@ msgstr "Tài khoản không đánh thuế" msgid "" "If the active field is set to False, it will allow you to hide the tax " "without removing it." -msgstr "" +msgstr "nếu thiết lập này bị sai. bạn sẽ ẩn nó thay vì xóa nó." #. module: account #: help:account.bank.statement,name:0 @@ -2039,8 +2056,6 @@ msgid "" "Invalid period ! Some periods overlap or the date period is not in the scope " "of the fiscal year. " msgstr "" -"Invalid period ! Some periods overlap or the date period is not in the scope " -"of the fiscal year. " #. module: account #: selection:account.invoice,state:0 @@ -2057,12 +2072,12 @@ msgid " Journal" msgstr " Sổ nhật ký" #. module: account -#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1333 #, python-format msgid "" "There is no default default debit account defined \n" "on journal \"%s\"" -msgstr "" +msgstr "đây là số tài khoản mặc định được định nghĩa trên quy trìnhl \"%s\"" #. module: account #: help:account.account,type:0 @@ -2093,6 +2108,9 @@ msgid "" "certified Chart of Accounts exists for your specified country, a generic one " "can be installed and will be selected by default." msgstr "" +"Các biểu đồ mặc định của tài khoản là lựa chọn phù hợp với nước bạn. Nếu " +"không có biểu đồ xác nhận tài khoản kế toán tồn tại cho đất nước chỉ định " +"của bạn, một chung có thể được cài đặt và sẽ được lựa chọn theo mặc định" #. module: account #: view:account.account.type:0 @@ -2114,7 +2132,7 @@ msgid "Description" msgstr "Mô tả" #. module: account -#: code:addons/account/account.py:2844 +#: code:addons/account/account.py:2888 #: code:addons/account/installer.py:498 #, python-format msgid "ECNJ" @@ -2134,7 +2152,7 @@ msgid "Income Account" msgstr "Tài khoản thu nhập" #. module: account -#: code:addons/account/invoice.py:352 +#: code:addons/account/invoice.py:351 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "There is no Accounting Journal of type Sale/Purchase defined!" @@ -2145,6 +2163,7 @@ msgid "Accounting Properties" msgstr "Accounting Properties" #. module: account +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 msgid "Entries Sorted By" @@ -2173,6 +2192,7 @@ msgstr "Product Template" #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2282,14 +2302,14 @@ msgid "Account Tax Code" msgstr "Mã số thuế" #. module: account -#: code:addons/account/invoice.py:545 +#: code:addons/account/invoice.py:552 #, python-format msgid "" "Can't find any account journal of %s type for this company.\n" "\n" "You can create one in the menu: \n" "Configuration\\Financial Accounting\\Accounts\\Journals." -msgstr "" +msgstr "không thể tìm trấy tài khoản nào trong quy trình %s của công ty này." #. module: account #: field:account.invoice.tax,base_code_id:0 @@ -2320,12 +2340,6 @@ msgid "" "useful because it enables you to preview at any time the tax that you owe at " "the start and end of the month or quarter." msgstr "" -"This menu prints a VAT declaration based on invoices or payments. Select one " -"or several periods of the fiscal year. The information required for a tax " -"declaration is automatically generated by OpenERP from invoices (or " -"payments, in some countries). This data is updated in real time. That’s very " -"useful because it enables you to preview at any time the tax that you owe at " -"the start and end of the month or quarter." #. module: account #: selection:account.move.line,centralisation:0 @@ -2358,7 +2372,7 @@ msgid "Account Model Entries" msgstr "Account Model Entries" #. module: account -#: code:addons/account/account.py:2796 +#: code:addons/account/account.py:2840 #: code:addons/account/installer.py:454 #, python-format msgid "EXJ" @@ -2412,6 +2426,7 @@ msgstr "" msgid "" "This report gives you an overview of the situation of a specific journal" msgstr "" +"Báo cáo này cung cấp cho bạn một tổng quan về tình hình cụ thể của quy trình" #. module: account #: constraint:product.category:0 @@ -2448,7 +2463,7 @@ msgid "Accounts" msgstr "Các tài khoản" #. module: account -#: code:addons/account/invoice.py:351 +#: code:addons/account/invoice.py:350 #, python-format msgid "Configuration Error!" msgstr "Lỗi cấu hình!" @@ -2460,13 +2475,12 @@ msgid "Average Price" msgstr "Giá trung bình" #. module: account -#: report:account.move.voucher:0 #: report:account.overdue:0 msgid "Date:" msgstr "Ngày:" #. module: account -#: code:addons/account/account.py:640 +#: code:addons/account/account.py:654 #, python-format msgid "" "You cannot modify company of this journal as its related record exist in " @@ -2504,6 +2518,7 @@ msgstr "Chiết khấu.(%)" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2564,6 +2579,8 @@ msgid "" "Automatically generate entries based on what has been entered in the system " "before a specific date." msgstr "" +"Tự động tạo các mục dựa trên những gì đã được nhập vào hệ thống trước khi " +"một ngày cụ thể" #. module: account #: view:account.aged.trial.balance:0 @@ -2617,16 +2634,16 @@ msgid "This wizard will create recurring accounting entries" msgstr "This wizard will create recurring accounting entries" #. module: account -#: code:addons/account/account.py:1181 +#: code:addons/account/account.py:1195 #, python-format msgid "No sequence defined on the journal !" msgstr "No sequence defined on the journal !" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 -#: code:addons/account/invoice.py:670 +#: code:addons/account/account_move_line.py:169 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" @@ -2730,6 +2747,8 @@ msgstr "" msgid "" "used in statement reconciliation domain, but shouldn't be used elswhere." msgstr "" +"được sử dụng trong lĩnh vực hòa giải tuyên bố, nhưng không nên được sử dụng " +"ở nơi khác." #. module: account #: field:account.invoice.tax,base_amount:0 @@ -2794,7 +2813,7 @@ msgid "Analytic Entries" msgstr "Analytic Entries" #. module: account -#: code:addons/account/account.py:822 +#: code:addons/account/account.py:836 #, python-format msgid "" "No fiscal year defined for this date !\n" @@ -2926,7 +2945,7 @@ msgid "BNK%s" msgstr "BNK%s" #. module: account -#: code:addons/account/account.py:2906 +#: code:addons/account/account.py:2950 #: code:addons/account/installer.py:296 #, python-format msgid "BNK" @@ -3046,6 +3065,7 @@ msgstr "Keep empty to use the expense account" #: field:account.common.report,journal_ids:0 #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 +#: report:account.general.ledger_landscape:0 #: view:account.journal.period:0 #: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 @@ -3106,7 +3126,7 @@ msgid "Starting Balance" msgstr "Số dư ban đầu" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "No Partner Defined !" msgstr "Không có đối tác được định nghĩa" @@ -3150,29 +3170,28 @@ msgstr "Sổ nhật ký:" #: view:account.invoice.report:0 #: selection:account.invoice.report,state:0 #: selection:account.journal.period,state:0 -#: report:account.move.voucher:0 #: view:account.subscription:0 #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 msgid "Draft" -msgstr "Dự thảo" +msgstr "Nháp" #. module: account #: model:ir.actions.act_window,name:account.action_account_configuration_installer msgid "Accounting Chart Configuration" -msgstr "Cấu hình Hệ thống tài khoản kế toán" +msgstr "Cấu hình Hệ thống Tài khoản kế toán" #. module: account #: field:account.tax.code,notprintable:0 #: field:account.tax.code.template,notprintable:0 msgid "Not Printable in Invoice" -msgstr "Not Printable in Invoice" +msgstr "Hóa đơn không thể in" #. module: account #: report:account.vat.declaration:0 #: field:account.vat.declaration,chart_tax_id:0 msgid "Chart of Tax" -msgstr "Hệ thống tài khoản thuế" +msgstr "Hệ thống Thuế" #. module: account #: view:account.journal:0 @@ -3204,7 +3223,7 @@ msgstr "" "won't be able to modify their accounting fields anymore." #. module: account -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Cannot delete invoice(s) that are already opened or paid !" msgstr "Không thể xóa các hóa đơn đang mở hoặc đã thanh toán !" @@ -3267,7 +3286,7 @@ msgstr "" "or 'Done' state!" #. module: account -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:532 #, python-format msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " @@ -3278,8 +3297,9 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" -msgstr "" +msgstr "phẩn tự tăng" #. module: account #: view:account.journal:0 @@ -3342,7 +3362,7 @@ msgstr "Hoạch đồ Kế toán" #. module: account #: view:account.tax.chart:0 msgid "(If you do not select period it will take all open periods)" -msgstr "(If you do not select period it will take all open periods)" +msgstr "" #. module: account #: field:account.journal,centralisation:0 @@ -3381,6 +3401,7 @@ msgstr "" #: field:account.entries.report,date:0 #: selection:account.general.journal,filter:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice.report,date:0 #: report:account.journal.period.print:0 #: view:account.move:0 @@ -3424,22 +3445,25 @@ msgid "Chart of Accounts Template" msgstr "Hoạch đồ Kế toán Mẫu" #. module: account -#: code:addons/account/account.py:2095 +#: code:addons/account/account.py:2109 #, python-format msgid "" "Maturity date of entry line generated by model line '%s' of model '%s' is " "based on partner payment term!\n" "Please define partner on it!" msgstr "" +"Ngày đáo hạn của các dòng nhập được tạo ra bởi '% s' mô hình dòng của '% s' " +"mô hình dựa trên thời hạn thanh toán đối tác!\n" +"Hãy xác định đối tác trên nó" #. module: account -#: code:addons/account/account_move_line.py:810 +#: code:addons/account/account_move_line.py:801 #, python-format msgid "Some entries are already reconciled !" msgstr "Một số bút toán đã được đối soát !" #. module: account -#: code:addons/account/account.py:1204 +#: code:addons/account/account.py:1218 #, python-format msgid "" "You cannot validate a Journal Entry unless all journal items are in same " @@ -3534,6 +3558,8 @@ msgstr "Tài khoản phải thu" msgid "" "You cannot create entries on different periods/journals in the same move" msgstr "" +"Bạn không thể tạo mục vào chu kỳ/sổ nhật ký khác nhau trong cùng một di " +"chuyển" #. module: account #: model:process.node,name:account.process_node_supplierpaymentorder0 @@ -3561,10 +3587,10 @@ msgstr "Đơn giá" #. module: account #: model:ir.actions.act_window,name:account.action_account_tree1 msgid "Analytic Items" -msgstr "" +msgstr "phân tích mặt hàng" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "Unable to change tax !" msgstr "Không thể thay đổi thuế !" @@ -3575,14 +3601,14 @@ msgid "#Entries" msgstr "Số bút toán" #. module: account -#: code:addons/account/invoice.py:1422 +#: code:addons/account/invoice.py:1437 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." -msgstr "" +msgstr "Bạn chọn một Đơn vị đo lường mà không tương thích với sản phẩm" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #, python-format msgid "" "The Payment Term of Supplier does not have Payment Term Lines(Computation) " @@ -3680,6 +3706,10 @@ msgid "" "debit/credit accounts, of type 'situation' and with a centralized " "counterpart." msgstr "" +"Các thực hành tốt nhất ở đây là sử dụng một tạp chí dành riêng để chứa các " +"mục mở của tất cả năm tài chính. Lưu ý rằng bạn nên xác định nó với mặc định " +"ghi nợ tài khoản tín dụng /, trong 'tình trạng' loại và với một đối tác tập " +"trung." #. module: account #: view:account.installer:0 @@ -3714,6 +3744,8 @@ msgstr "Validate" #: sql_constraint:account.model.line:0 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!" msgstr "" +"Sai tín dụng hoặc giá trị ghi nợ trong mô hình (tín dụng hay nợ phải trở " +"thành \"0 \")!" #. module: account #: model:ir.actions.act_window,help:account.action_account_invoice_report_all @@ -3801,6 +3833,8 @@ msgid "" "If the active field is set to False, it will allow you to hide the account " "without removing it." msgstr "" +"Nếu lĩnh vực hoạt động được thiết lập để sai, nó sẽ cho phép bạn ẩn các tài " +"khoản mà không cần loại bỏ nó." #. module: account #: view:account.tax.template:0 @@ -3853,6 +3887,8 @@ msgid "" "This account will be used to value outgoing stock for the current product " "category using sale price" msgstr "" +"Tài khoản này sẽ được sử dụng để chứng khoán đi giá trị cho các loại sản " +"phẩm hiện tại bằng cách sử dụng giá bán" #. module: account #: selection:account.automatic.reconcile,power:0 @@ -3885,7 +3921,7 @@ msgid "Acc.Type" msgstr "Loại tài khoản" #. module: account -#: code:addons/account/invoice.py:714 +#: code:addons/account/invoice.py:722 #, python-format msgid "Global taxes defined, but are not in invoice lines !" msgstr "Global taxes defined, but are not in invoice lines !" @@ -3949,10 +3985,11 @@ msgstr "" "created in 'Posted' state." #. module: account -#: code:addons/account/account_analytic_line.py:91 +#: code:addons/account/account_analytic_line.py:90 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" +"Không có tài khoản chi phí quy định cho sản phẩm này: \"% s \" (id:% d)" #. module: account #: view:res.partner:0 @@ -4012,7 +4049,7 @@ msgstr "Check if you want to display Accounts with 0 balance too." #. module: account #: view:account.tax:0 msgid "Compute Code" -msgstr "" +msgstr "mã tự động tính" #. module: account #: view:account.account.template:0 @@ -4126,7 +4163,7 @@ msgid "Credit Notes" msgstr "Credit Notes" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "Unable to find a valid period !" @@ -4168,6 +4205,8 @@ msgid "" "This will automatically configure your chart of accounts, bank accounts, " "taxes and journals according to the selected template" msgstr "" +"Điều này sẽ tự động cấu hình biểu đồ của bạn các tài khoản, tài khoản ngân " +"hàng, thuế và các tạp chí theo mẫu được lựa chọn" #. module: account #: field:account.tax,price_include:0 @@ -4197,11 +4236,11 @@ msgid "Change" msgstr "Thay đổi" #. module: account -#: code:addons/account/account.py:1290 -#: code:addons/account/account.py:1318 -#: code:addons/account/account.py:1325 -#: code:addons/account/account_move_line.py:1055 -#: code:addons/account/invoice.py:896 +#: code:addons/account/account.py:1304 +#: code:addons/account/account.py:1332 +#: code:addons/account/account.py:1339 +#: code:addons/account/account_move_line.py:1061 +#: code:addons/account/invoice.py:904 #: code:addons/account/wizard/account_automatic_reconcile.py:152 #: code:addons/account/wizard/account_fiscalyear_close.py:78 #: code:addons/account/wizard/account_fiscalyear_close.py:81 @@ -4305,13 +4344,16 @@ msgid "You must define an analytic journal of type '%s' !" msgstr "You must define an analytic journal of type '%s' !" #. module: account -#: code:addons/account/account.py:1397 +#: code:addons/account/account.py:1411 #, python-format msgid "" "Couldn't create move with currency different from the secondary currency of " "the account \"%s - %s\". Clear the secondary currency field of the account " "definition if you want to accept all currencies." msgstr "" +"Không thể tạo ra di chuyển với tiền tệ khác nhau từ các loại tiền tệ thứ cấp " +"của tài khoản \"% s -% s\". Rõ ràng lĩnh vực tiền tệ thứ cấp của định nghĩa " +"tài khoản nếu bạn muốn chấp nhận tất cả các loại tiền tệ." #. module: account #: field:account.invoice.refund,date:0 @@ -4373,7 +4415,7 @@ msgid "Invoices" msgstr "Các hóa đơn" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "" "Please verify the price of the invoice !\n" @@ -4487,25 +4529,24 @@ msgid "Third Party (Country)" msgstr "Third Party (Country)" #. module: account -#: code:addons/account/account.py:938 -#: code:addons/account/account.py:940 -#: code:addons/account/account.py:1181 -#: code:addons/account/account.py:1393 -#: code:addons/account/account.py:1397 -#: code:addons/account/account_cash_statement.py:249 -#: code:addons/account/account_move_line.py:780 -#: code:addons/account/account_move_line.py:803 -#: code:addons/account/account_move_line.py:805 -#: code:addons/account/account_move_line.py:808 -#: code:addons/account/account_move_line.py:810 -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account.py:952 +#: code:addons/account/account.py:954 +#: code:addons/account/account.py:1195 +#: code:addons/account/account.py:1407 +#: code:addons/account/account.py:1411 +#: code:addons/account/account_cash_statement.py:250 +#: code:addons/account/account_move_line.py:771 +#: code:addons/account/account_move_line.py:794 +#: code:addons/account/account_move_line.py:796 +#: code:addons/account/account_move_line.py:799 +#: code:addons/account/account_move_line.py:801 +#: code:addons/account/account_move_line.py:1123 #: code:addons/account/report/common_report_header.py:92 -#: code:addons/account/wizard/account_change_currency.py:39 -#: code:addons/account/wizard/account_change_currency.py:60 -#: code:addons/account/wizard/account_change_currency.py:65 -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:38 +#: code:addons/account/wizard/account_change_currency.py:59 +#: code:addons/account/wizard/account_change_currency.py:64 +#: code:addons/account/wizard/account_change_currency.py:70 #: code:addons/account/wizard/account_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_report_common.py:120 #: code:addons/account/wizard/account_report_common.py:126 #, python-format @@ -4519,7 +4560,7 @@ msgstr "Lỗi" #: field:account.analytic.cost.ledger.journal.report,date2:0 #: field:account.analytic.inverted.balance,date2:0 msgid "End of period" -msgstr "Cuối chu kỳ" +msgstr "Kết thúc chu kỳ" #. module: account #: view:res.partner:0 @@ -4527,7 +4568,7 @@ msgid "Bank Details" msgstr "Chi tiết ngân hàng" #. module: account -#: code:addons/account/invoice.py:720 +#: code:addons/account/invoice.py:728 #, python-format msgid "Taxes missing !" msgstr "Taxes missing !" @@ -4584,7 +4625,7 @@ msgid "Check Date not in the Period" msgstr "Kiểm tra Ngày có nằm trong Chu kỳ" #. module: account -#: code:addons/account/account.py:1210 +#: code:addons/account/account.py:1224 #, python-format msgid "" "You can not modify a posted entry of this journal !\n" @@ -4606,7 +4647,7 @@ msgid "Child Tax Accounts" msgstr "Child Tax Accounts" #. module: account -#: code:addons/account/account.py:940 +#: code:addons/account/account.py:954 #, python-format msgid "Start period should be smaller then End period" msgstr "Chu kỳ bắt đầu phải nhỏ hơn chu kỳ kết thúc" @@ -4636,6 +4677,7 @@ msgstr "Analytic Balance -" #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 #: report:account.partner.balance:0 @@ -4666,7 +4708,7 @@ msgstr "Thanh toán" #. module: account #: view:account.tax:0 msgid "Reverse Compute Code" -msgstr "" +msgstr "Tính mã Ngược" #. module: account #: field:account.subscription.line,move_id:0 @@ -4695,6 +4737,7 @@ msgstr "Tên cột" msgid "" "This report gives you an overview of the situation of your general journals" msgstr "" +"Báo cáo này cung cấp cho bạn một tổng quan về tình hình chung của bạn" #. module: account #: field:account.entries.report,year:0 @@ -4718,7 +4761,7 @@ msgid "Line 1:" msgstr "Dòng 1:" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "Integrity Error !" msgstr "Lỗi toàn vẹn !" @@ -4832,7 +4875,7 @@ msgstr "Giá trị" #: code:addons/account/wizard/account_fiscalyear_close.py:41 #, python-format msgid "End of Fiscal Year Entry" -msgstr "" +msgstr "cuối năm tài chính" #. module: account #: model:process.transition,name:account.process_transition_customerinvoice0 @@ -4866,7 +4909,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "No period found !" @@ -4940,7 +4983,7 @@ msgstr "" "Ngày = 22, Ngày trong Tháng =- 1, sau đó đúng hạn là 28/02" #. module: account -#: code:addons/account/account.py:2896 +#: code:addons/account/account.py:2940 #: code:addons/account/installer.py:283 #: code:addons/account/installer.py:295 #, python-format @@ -4968,7 +5011,7 @@ msgid "Start of period" msgstr "Bắt đầu chu kỳ" #. module: account -#: code:addons/account/account_move_line.py:1193 +#: code:addons/account/account_move_line.py:1199 #, python-format msgid "" "You can not do this modification on a reconciled entry ! Please note that " @@ -5026,12 +5069,12 @@ msgstr "End of Year Entries Journal" #. module: account #: code:addons/account/account_bank_statement.py:331 -#: code:addons/account/invoice.py:405 -#: code:addons/account/invoice.py:505 -#: code:addons/account/invoice.py:520 -#: code:addons/account/invoice.py:528 -#: code:addons/account/invoice.py:545 -#: code:addons/account/invoice.py:1347 +#: code:addons/account/invoice.py:408 +#: code:addons/account/invoice.py:508 +#: code:addons/account/invoice.py:523 +#: code:addons/account/invoice.py:531 +#: code:addons/account/invoice.py:552 +#: code:addons/account/invoice.py:1361 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" @@ -5113,12 +5156,14 @@ msgid "Sort By" msgstr "Sắp xếp theo" #. module: account -#: code:addons/account/account.py:1326 +#: code:addons/account/account.py:1340 #, python-format msgid "" "There is no default default credit account defined \n" "on journal \"%s\"" msgstr "" +"Không có mặc định tài khoản mặc định tín dụng quy định\n" +"trên tạp chí \"% s \"" #. module: account #: field:account.entries.report,amount_currency:0 @@ -5206,6 +5251,10 @@ msgid "" "impossible any new entry record. Close a fiscal year when you need to " "finalize your end of year results definitive " msgstr "" +"Nếu không có mục nhập bổ sung phải được ghi trên một năm tài chính, bạn có " +"thể đóng nó từ đây. Nó sẽ đóng tất cả các thời kỳ mở cửa trong năm nay sẽ " +"làm cho không thể ghi lại bất kỳ mục nhập mới. Gần một năm tài chính khi bạn " +"cần phải hoàn thiện cuối cùng của bạn kết quả năm dứt khoát " #. module: account #: field:account.central.journal,amount_currency:0 @@ -5241,7 +5290,7 @@ msgstr "Có hiệu lực đến" #. module: account #: view:board.board:0 msgid "Aged Receivables" -msgstr "" +msgstr "Tuổi từ khoản phải thu" #. module: account #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile @@ -5266,7 +5315,7 @@ msgid "Generate Opening Entries" msgstr "Generate Opening Entries" #. module: account -#: code:addons/account/account_move_line.py:738 +#: code:addons/account/account_move_line.py:729 #, python-format msgid "Already Reconciled!" msgstr "Đã được đối soát!" @@ -5304,7 +5353,7 @@ msgstr "Tài khoản con" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:830 +#: code:addons/account/account_move_line.py:821 #, python-format msgid "Write-Off" msgstr "Miễn bỏ" @@ -5415,6 +5464,9 @@ msgid "" "OpenERP allows you to define the tax structure and manage it from this menu. " "You can define both numeric and alphanumeric tax codes." msgstr "" +"Việc xác định mã số thuế phụ thuộc vào việc kê khai thuế của các nước bạn. " +"OpenERP cho phép bạn xác định cấu trúc thuế và quản lý nó từ trình đơn này. " +"Bạn có thể xác định cả hai mã số thuế số và chữ số." #. module: account #: help:account.partner.reconcile.process,progress:0 @@ -5451,7 +5503,7 @@ msgid "# of Lines" msgstr "Số dòng" #. module: account -#: code:addons/account/wizard/account_change_currency.py:60 +#: code:addons/account/wizard/account_change_currency.py:59 #, python-format msgid "New currency is not confirured properly !" msgstr "Loại tiền mới chưa được cấu hình đúng !" @@ -5476,14 +5528,14 @@ msgid "Filter by" msgstr "Lọc theo" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "You can not use an inactive account!" msgstr "Bạn không thể sử dụng một tài khoản không hoạt động!" #. module: account -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:794 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "Entries are not of the same account or already reconciled ! " @@ -5504,7 +5556,7 @@ msgstr "Account General Journal" #: code:addons/account/report/common_report_header.py:100 #, python-format msgid "No Filter" -msgstr "" +msgstr "không có ô trống" #. module: account #: field:account.payment.term.line,days:0 @@ -5518,7 +5570,7 @@ msgstr "7" #. module: account #: code:addons/account/account_bank_statement.py:391 -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Invalid action !" msgstr "Hành động không hợp lệ !" @@ -5527,7 +5579,7 @@ msgstr "Hành động không hợp lệ !" #: code:addons/account/wizard/account_move_journal.py:102 #, python-format msgid "Period: %s" -msgstr "" +msgstr "thời gian: %s" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template @@ -5635,6 +5687,11 @@ msgid "" "line of the expense account. OpenERP will propose to you automatically the " "Tax related to this account and the counterpart \"Account Payable\"." msgstr "" +"Quan điểm này có thể được sử dụng bởi các kế toán để nhanh chóng ghi lại các " +"mục trong OpenERP. Nếu bạn muốn ghi lại một hóa đơn nhà cung cấp, bắt đầu " +"bằng cách ghi các dòng của các tài khoản chi phí. OpenERP sẽ đề xuất để bạn " +"tự động các thuế liên quan đến tài khoản này và đối tác \"Tài khoản phải " +"trả\"." #. module: account #: field:account.entries.report,date_created:0 @@ -5710,7 +5767,7 @@ msgstr "Cấu hình Báo cáo" #. module: account #: constraint:account.move.line:0 msgid "Company must be same for its related account and period." -msgstr "" +msgstr "Công ty phải cùng cho tài khoản thời gian liên quan và của nó." #. module: account #: field:account.tax,type:0 @@ -5735,7 +5792,7 @@ msgid "Companies" msgstr "Các công ty" #. module: account -#: code:addons/account/account.py:532 +#: code:addons/account/account.py:546 #, python-format msgid "" "You cannot modify Company of account as its related record exist in Entry " @@ -6015,9 +6072,9 @@ msgid "Optional create" msgstr "Optional create" #. module: account -#: code:addons/account/invoice.py:406 -#: code:addons/account/invoice.py:506 -#: code:addons/account/invoice.py:1348 +#: code:addons/account/invoice.py:409 +#: code:addons/account/invoice.py:509 +#: code:addons/account/invoice.py:1362 #, python-format msgid "Can not find account chart for this company, Please Create account." msgstr "Can not find account chart for this company, Please Create account." @@ -6054,7 +6111,7 @@ msgstr "Tập trung" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Generate Your Accounting Chart from a Chart Template" -msgstr "" +msgstr "Tạo Sơ đồ kế toán của bạn từ một biểu đồ" #. module: account #: view:account.account:0 @@ -6127,7 +6184,7 @@ msgstr "Đã được đối soát" #: report:account.invoice:0 #: field:account.invoice.tax,base:0 msgid "Base" -msgstr "Cơ sở" +msgstr "Gốc" #. module: account #: field:account.model,name:0 @@ -6168,8 +6225,8 @@ msgid "Analytic Entries Statistics" msgstr "Analytic Entries Statistics" #. module: account -#: code:addons/account/account_analytic_line.py:143 -#: code:addons/account/account_move_line.py:905 +#: code:addons/account/account_analytic_line.py:141 +#: code:addons/account/account_move_line.py:897 #, python-format msgid "Entries: " msgstr "Các bút toán: " @@ -6177,10 +6234,10 @@ msgstr "Các bút toán: " #. module: account #: view:account.use.model:0 msgid "Create manual recurring entries in a chosen journal." -msgstr "" +msgstr "Tạo các mục hướng dẫn định kỳ trên quy trình lựa chọn" #. module: account -#: code:addons/account/account.py:1393 +#: code:addons/account/account.py:1407 #, python-format msgid "Couldn't create move between different companies" msgstr "Couldn't create move between different companies" @@ -6196,6 +6253,13 @@ msgid "" "account. From this view, you can create and manage the account types you " "need for your company." msgstr "" +"Một loại tài khoản được sử dụng để xác định một tài khoản được sử dụng trong " +"từng tạp chí. Phương pháp hoãn của một loại tài khoản xác định quy trình " +"đóng hàng năm. Các báo cáo như Bảng cân đối và báo cáo lãi lỗ, và sử dụng " +"các loại (lãi / lỗ hay bảng cân đối). Ví dụ, các loại tài khoản có thể được " +"liên kết đến một tài khoản tài khoản tài sản, chi phí, hoặc tài khoản phải " +"nộp. Từ quan điểm này, bạn có thể tạo và quản lý các loại tài khoản bạn cần " +"cho công ty của bạn." #. module: account #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree @@ -6221,7 +6285,7 @@ msgid "Total debit" msgstr "Tổng nợ" #. module: account -#: code:addons/account/account_move_line.py:781 +#: code:addons/account/account_move_line.py:772 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "Bút toán \"%s\" không hợp lệ !" @@ -6290,30 +6354,31 @@ msgid " valuation: percent" msgstr " định giá: phần trăm" #. module: account -#: code:addons/account/account.py:499 -#: code:addons/account/account.py:501 -#: code:addons/account/account.py:822 -#: code:addons/account/account.py:901 -#: code:addons/account/account.py:976 -#: code:addons/account/account.py:1204 -#: code:addons/account/account.py:1210 -#: code:addons/account/account.py:2095 -#: code:addons/account/account.py:2333 -#: code:addons/account/account_analytic_line.py:90 -#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account.py:509 +#: code:addons/account/account.py:511 +#: code:addons/account/account.py:836 +#: code:addons/account/account.py:915 +#: code:addons/account/account.py:990 +#: code:addons/account/account.py:1218 +#: code:addons/account/account.py:1224 +#: code:addons/account/account.py:2109 +#: code:addons/account/account.py:2357 +#: code:addons/account/account_analytic_line.py:89 +#: code:addons/account/account_analytic_line.py:98 #: code:addons/account/account_bank_statement.py:292 #: code:addons/account/account_bank_statement.py:305 #: code:addons/account/account_bank_statement.py:345 -#: code:addons/account/account_cash_statement.py:328 -#: code:addons/account/account_cash_statement.py:348 -#: code:addons/account/account_move_line.py:1176 -#: code:addons/account/account_move_line.py:1191 -#: code:addons/account/account_move_line.py:1193 -#: code:addons/account/invoice.py:785 -#: code:addons/account/invoice.py:815 -#: code:addons/account/invoice.py:1008 +#: code:addons/account/account_cash_statement.py:329 +#: code:addons/account/account_cash_statement.py:349 +#: code:addons/account/account_move_line.py:1182 +#: code:addons/account/account_move_line.py:1197 +#: code:addons/account/account_move_line.py:1199 +#: code:addons/account/invoice.py:793 +#: code:addons/account/invoice.py:823 +#: code:addons/account/invoice.py:1014 #: code:addons/account/wizard/account_invoice_refund.py:100 #: code:addons/account/wizard/account_invoice_refund.py:102 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" @@ -6350,6 +6415,10 @@ msgid "" "reconcile in a series of accounts. It finds entries for each partner where " "the amounts correspond." msgstr "" +"Đối với hoá đơn được coi là thanh toán, ghi hoá đơn phải được đối chiếu với " +"các đối tác, thường là các khoản thanh toán. Với các chức năng tự động hoà " +"giải, OpenERP làm cho tìm kiếm của riêng mình cho các mục để hòa giải trong " +"một loạt các tài khoản. Nó tìm thấy mục cho từng đối tác mà số tiền tương ứng" #. module: account #: view:account.move:0 @@ -6378,6 +6447,8 @@ msgid "" "This report is an analysis done by a partner. It is a PDF report containing " "one line per partner representing the cumulative credit balance" msgstr "" +"Báo cáo này là một phân tích được thực hiện bởi một đối tác. Đây là một báo " +"cáo PDF có chứa một dòng cho mỗi đối tác đại diện cho số dư tích lũy" #. module: account #: code:addons/account/wizard/account_validate_account_move.py:61 @@ -6416,7 +6487,7 @@ msgstr "Tất cả bút toán" #: constraint:product.template:0 msgid "" "Error: The default UOM and the purchase UOM must be in the same category." -msgstr "" +msgstr "Lỗi: UOM mặc định và UOM mua phải được trong cùng thể loại." #. module: account #: view:account.journal.select:0 @@ -6424,7 +6495,7 @@ msgid "Journal Select" msgstr "Journal Select" #. module: account -#: code:addons/account/wizard/account_change_currency.py:65 +#: code:addons/account/wizard/account_change_currency.py:64 #, python-format msgid "Currnt currency is not confirured properly !" msgstr "Loại tiền hiện tại không được cấu hình đúng !" @@ -6441,9 +6512,11 @@ msgstr "Taxes Fiscal Position" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger +#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" msgstr "Sổ cái" @@ -6461,6 +6534,9 @@ msgid "" "allowing you to quickly check the balance of each of your accounts in a " "single report" msgstr "" +"Báo cáo này cho phép bạn in hay tạo ra một pdf cân bằng thử nghiệm của bạn " +"cho phép bạn nhanh chóng kiểm tra số dư của từng tài khoản của bạn trong một " +"báo cáo duy nhất." #. module: account #: help:account.move,to_check:0 @@ -6501,7 +6577,7 @@ msgid "Total:" msgstr "Tổng cộng:" #. module: account -#: code:addons/account/account.py:2050 +#: code:addons/account/account.py:2064 #, python-format msgid "" "You can specify year, month and date in the name of the model using the " @@ -6539,7 +6615,7 @@ msgid "Child Codes" msgstr "Child Codes" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #: code:addons/account/wizard/account_invoice_refund.py:137 #, python-format msgid "Data Insufficient !" @@ -6642,6 +6718,10 @@ msgid "" "an agreement with a customer or a supplier. With Define Recurring Entries, " "you can create such entries to automate the postings in the system." msgstr "" +"Một mục định kỳ là một mục linh tinh xảy ra trên một cơ sở thường xuyên từ " +"một ngày cụ thể, tức là tương ứng với chữ ký của hợp đồng hoặc thỏa thuận " +"với một khách hàng hay nhà cung cấp. Với Xác định định kỳ mục, bạn có thể " +"tạo mục này để tự động hoá các thông tin đăng trong hệ thống" #. module: account #: field:account.entries.report,product_uom_id:0 @@ -6658,6 +6738,11 @@ msgid "" "basis. You can enter the coins that are in your cash box, and then post " "entries when money comes in or goes out of the cash box." msgstr "" +"Một tính tiền cho phép bạn quản lý các mục tiền mặt trong các tạp chí tiền " +"mặt của bạn. Tính năng này cung cấp một cách dễ dàng để theo dõi các khoản " +"thanh toán tiền mặt trên cơ sở hàng ngày. Bạn có thể nhập các đồng tiền có " +"trong hộp bằng tiền mặt của bạn, và sau đó đăng nhập khi tiền đến trong hoặc " +"đi ra khỏi hộp bằng tiền mặt." #. module: account #: selection:account.automatic.reconcile,power:0 @@ -6713,7 +6798,7 @@ msgid "Lines" msgstr "Lines" #. module: account -#: code:addons/account/invoice.py:521 +#: code:addons/account/invoice.py:524 #, python-format msgid "" "Can not find account chart for this company in invoice line account, Please " @@ -6741,7 +6826,7 @@ msgstr "Are you sure you want to open this invoice ?" #: code:addons/account/account_move_line.py:963 #, python-format msgid "Accounting Entries" -msgstr "" +msgstr "kế toán Entries" #. module: account #: field:account.account.template,parent_id:0 @@ -6812,6 +6897,9 @@ msgid "" "You can search for individual account entries through useful information. To " "search for account entries, open a journal, then select a record line." msgstr "" +"Bạn có thể tìm kiếm các mục tài khoản cá nhân thông qua các thông tin hữu " +"ích. Để tìm kiếm các mục tài khoản, mở một tạp chí, sau đó chọn một dòng ghi " +"lại." #. module: account #: report:account.invoice:0 @@ -6910,10 +6998,10 @@ msgstr "" "to create specific taxes in a custom domain." #. module: account -#: code:addons/account/account.py:938 +#: code:addons/account/account.py:952 #, python-format msgid "You should have chosen periods that belongs to the same company" -msgstr "You should have chosen periods that belongs to the same company" +msgstr "" #. module: account #: field:account.fiscalyear.close,report_name:0 @@ -7024,7 +7112,7 @@ msgid "Sign on Reports" msgstr "Sign on Reports" #. module: account -#: code:addons/account/account_cash_statement.py:249 +#: code:addons/account/account_cash_statement.py:250 #, python-format msgid "You can not have two open register for the same journal" msgstr "You can not have two open register for the same journal" @@ -7037,7 +7125,7 @@ msgstr " ngày trong tháng= -1" #. module: account #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "Lỗi! Bạn không thể tạo ra các thành viên đệ quy có liên quan." #. module: account #: help:account.journal,type:0 @@ -7059,7 +7147,6 @@ msgstr "" #. module: account #: report:account.invoice:0 #: view:account.invoice:0 -#: report:account.move.voucher:0 msgid "PRO-FORMA" msgstr "PRO-FORMA" @@ -7091,6 +7178,7 @@ msgstr "Thông tin tùy chọn" #. module: account #: view:account.analytic.line:0 +#: field:account.bank.statement,user_id:0 #: view:account.journal:0 #: field:account.journal,user_id:0 #: view:analytic.entries.report:0 @@ -7118,13 +7206,13 @@ msgstr "" "the limit date for the payment of this line." #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "Bad account !" msgstr "Tài khoản không đúng !" #. module: account -#: code:addons/account/account.py:2777 +#: code:addons/account/account.py:2821 #: code:addons/account/installer.py:432 #, python-format msgid "Sales Journal" @@ -7134,7 +7222,7 @@ msgstr "Sổ nhật ký Bán hàng" #: code:addons/account/wizard/account_move_journal.py:104 #, python-format msgid "Open Journal Items !" -msgstr "" +msgstr "mở quy trình của một mặt hàng" #. module: account #: model:ir.model,name:account.model_account_invoice_tax @@ -7142,7 +7230,7 @@ msgid "Invoice Tax" msgstr "Thuế Hóa đơn" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "No piece number !" msgstr "No piece number !" @@ -7299,6 +7387,11 @@ msgid "" "in which they will appear. Then you can create a new journal and link your " "view to it." msgstr "" +"Tại đây bạn có thể tùy chỉnh một xem tạp chí hiện có hoặc tạo ra một cái " +"nhìn mới. Tạp chí xác định xem cách bạn có thể ghi các mục trong tạp chí của " +"bạn. Chọn các trường bạn muốn xuất hiện trên tạp chí và xác định trình tự, " +"trong đó họ sẽ xuất hiện. Sau đó, bạn có thể tạo ra một tạp chí mới và liên " +"kết của bạn để xem nó." #. module: account #: view:account.payment.term.line:0 @@ -7384,17 +7477,17 @@ msgid "Fixed" msgstr "Đã sửa" #. module: account -#: code:addons/account/account.py:506 -#: code:addons/account/account.py:519 -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:516 +#: code:addons/account/account.py:529 #: code:addons/account/account.py:532 -#: code:addons/account/account.py:640 -#: code:addons/account/account.py:927 -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 -#: code:addons/account/invoice.py:714 -#: code:addons/account/invoice.py:717 -#: code:addons/account/invoice.py:720 +#: code:addons/account/account.py:546 +#: code:addons/account/account.py:654 +#: code:addons/account/account.py:941 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/invoice.py:722 +#: code:addons/account/invoice.py:725 +#: code:addons/account/invoice.py:728 #, python-format msgid "Warning !" msgstr "Cảnh báo !" @@ -7426,6 +7519,7 @@ msgstr "Số tiền (bằng chữ) :" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7456,7 +7550,7 @@ msgid "Can not %s draft/proforma/cancel invoice." msgstr "Can not %s draft/proforma/cancel invoice." #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "No Invoice Lines !" msgstr "No Invoice Lines !" @@ -7507,7 +7601,7 @@ msgid "Deferral Method" msgstr "Phương pháp hoãn lại" #. module: account -#: code:addons/account/invoice.py:359 +#: code:addons/account/invoice.py:360 #, python-format msgid "Invoice '%s' is paid." msgstr "Hóa đơn '%s' đã được trả." @@ -7520,7 +7614,7 @@ msgstr "Bút toán Tự động" #. module: account #: constraint:account.tax.code.template:0 msgid "Error ! You can not create recursive Tax Codes." -msgstr "" +msgstr "Lỗi! Bạn không thể tạo mã số thuế đệ quy." #. module: account #: view:account.invoice.line:0 @@ -7572,7 +7666,7 @@ msgid "Associated Partner" msgstr "Đối tác Liên quan" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "You must first select a partner !" msgstr "You must first select a partner !" @@ -7607,11 +7701,14 @@ msgid "" "will see the taxes with codes related to your legal statement according to " "your country." msgstr "" +"Các biểu đồ các loại thuế được sử dụng để tạo ra các báo cáo thuế định kỳ " +"của bạn. Bạn sẽ thấy các loại thuế với mã số liên quan tới tuyên bố pháp lý " +"của mình theo quy định của nước bạn." #. module: account #: view:account.installer.modules:0 msgid "Add extra Accounting functionalities to the ones already installed." -msgstr "" +msgstr "Thêm Kế toán thêm chức năng cho những người đã được cài đặt." #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -7637,7 +7734,7 @@ msgid "Choose Fiscal Year" msgstr "Chọn năm tài chính" #. module: account -#: code:addons/account/account.py:2841 +#: code:addons/account/account.py:2885 #: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" @@ -7674,6 +7771,7 @@ msgstr "Quản lý Kế toán và Tài chính" #: view:account.entries.report:0 #: field:account.entries.report,period_id:0 #: view:account.fiscalyear:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: view:account.invoice.report:0 #: field:account.journal.period,period_id:0 @@ -7748,6 +7846,10 @@ msgid "" "can easily generate refunds and reconcile them directly from the invoice " "form." msgstr "" +"Với khách hàng Hoàn lại tiền bạn có thể quản lý các ghi chú tín dụng cho " +"khách hàng của bạn. Hoàn là một tài liệu mà các khoản tín dụng hoá đơn hoàn " +"toàn hoặc một phần. Bạn có thể dễ dàng tạo ra hoàn và đối chiếu trực tiếp từ " +"các mẫu hoá đơn" #. module: account #: model:ir.actions.act_window,help:account.action_account_vat_declaration @@ -7759,12 +7861,6 @@ msgid "" "useful because it enables you to preview at any time the tax that you owe at " "the start and end of the month or quarter." msgstr "" -"This menu print a VAT declaration based on invoices or payments. You can " -"select one or several periods of the fiscal year. Information required for a " -"tax declaration is automatically generated by OpenERP from invoices (or " -"payments, in some countries). This data is updated in real time. That’s very " -"useful because it enables you to preview at any time the tax that you owe at " -"the start and end of the month or quarter." #. module: account #: report:account.invoice:0 @@ -7797,6 +7893,8 @@ msgid "" "added, Loss: Amount will be duducted), which is calculated from Profilt & " "Loss Report" msgstr "" +"Tài khoản này dùng để chuyển lợi nhuận / lỗ (lợi nhuận: Số tiền sẽ được thêm " +"vào, Mất: Số tiền sẽ được duducted), được tính từ Profilt & Loss Báo cáo" #. module: account #: help:account.move.line,blocked:0 @@ -7846,7 +7944,7 @@ msgid "Account Types" msgstr "Loại tài khoản" #. module: account -#: code:addons/account/invoice.py:897 +#: code:addons/account/invoice.py:905 #, python-format msgid "Cannot create invoice move on centralised journal" msgstr "Cannot create invoice move on centralised journal" @@ -7896,6 +7994,7 @@ msgstr "Sổ nhật ký Hoàn tiền" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 +#: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 msgid "Filter By" msgstr "Lọc bởi" @@ -7908,6 +8007,10 @@ msgid "" "sales orders or deliveries. You should only confirm them before sending them " "to your customers." msgstr "" +"Với hóa đơn khách hàng bạn có thể tạo và quản lý hoá đơn bán hàng cấp cho " +"khách hàng của bạn. OpenERP cũng có thể tạo ra các hoá đơn bán hàng dự thảo " +"tự động từ các đơn đặt hàng hoặc giao hàng. Bạn chỉ nên xác nhận chúng trước " +"khi gửi cho khách hàng của bạn." #. module: account #: view:account.entries.report:0 @@ -7934,7 +8037,7 @@ msgid "Payment Term Line" msgstr "Payment Term Line" #. module: account -#: code:addons/account/account.py:2794 +#: code:addons/account/account.py:2838 #: code:addons/account/installer.py:452 #, python-format msgid "Purchase Journal" @@ -7980,6 +8083,8 @@ msgstr "Các nhà cung cấp" msgid "" "You cannot create more than one move per period on centralized journal" msgstr "" +"Bạn không thể tạo ra nhiều hơn một khoảng thời gian di chuyển mỗi ngày tập " +"trung" #. module: account #: view:account.journal:0 @@ -7997,6 +8102,8 @@ msgid "" "The residual amount on a receivable or payable of a journal entry expressed " "in the company currency." msgstr "" +"Số tiền còn dư trên phải thu hoặc phải trả của một mục tạp chí thể hiện bằng " +"tiền của công ty" #. module: account #: view:account.payment.term.line:0 @@ -8101,10 +8208,11 @@ msgid "" "The amount of the voucher must be the same amount as the one on the " "statement line" msgstr "" +"Số tiền của chứng từ phải được cùng một số tiền như trên các dòng lệnh" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "Bad account!" msgstr "Tài khoản không hợp lệ!" @@ -8115,10 +8223,10 @@ msgid "Keep empty for all open fiscal years" msgstr "Keep empty for all open fiscal years" #. module: account -#: code:addons/account/account_move_line.py:1056 +#: code:addons/account/account_move_line.py:1062 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" -msgstr "" +msgstr "Việc di chuyển tài khoản (% s) để tập trung đã được khẳng định!" #. module: account #: help:account.move.line,amount_currency:0 @@ -8138,6 +8246,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -8179,6 +8288,13 @@ msgid "" "would be referred to as FY 2011. You are not obliged to follow the actual " "calendar year." msgstr "" +"Xác định năm tài chính của công ty theo nhu cầu của bạn. Một năm tài chính " +"là một khoảng thời gian cuối cùng mà một công ty tài khoản được tạo thành " +"(thường là 12 tháng). Năm tài chính thường được gọi theo ngày, trong đó nó " +"kết thúc. Ví dụ, nếu năm tài chính của công ty kết thúc ngày 30 tháng 11 năm " +"2011, sau đó tất cả mọi thứ từ 01 tháng mười hai năm 2010 và ngày 30 Tháng " +"11 năm 2011 sẽ được gọi là năm tài chính 2011. Bạn không có trách nhiệm làm " +"theo năm dương lịch thực tế." #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open @@ -8327,14 +8443,14 @@ msgid "Period from" msgstr "Chu kỳ từ" #. module: account -#: code:addons/account/account.py:2817 +#: code:addons/account/account.py:2861 #: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" msgstr "Sales Refund Journal" #. module: account -#: code:addons/account/account.py:927 +#: code:addons/account/account.py:941 #, python-format msgid "" "You cannot modify company of this period as its related record exist in " @@ -8348,7 +8464,7 @@ msgstr "" #: view:account.move.line:0 #: view:account.payment.term:0 msgid "Information" -msgstr "Information" +msgstr "Thông tin" #. module: account #: model:process.node,note:account.process_node_bankstatement0 @@ -8358,7 +8474,7 @@ msgstr "Registered payment" #. module: account #: view:account.fiscalyear.close.state:0 msgid "Close states of Fiscal year and periods" -msgstr "Close states of Fiscal year and periods" +msgstr "" #. module: account #: view:account.analytic.line:0 @@ -8385,7 +8501,7 @@ msgid "Purchase Tax(%)" msgstr "Thuế mua hàng(%)" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "Please create some invoice lines." msgstr "Please create some invoice lines." @@ -8401,7 +8517,7 @@ msgid "Configure Your Accounting Application" msgstr "Cấu hình Ứng dụng Kế toán của bạn" #. module: account -#: code:addons/account/account.py:2820 +#: code:addons/account/account.py:2864 #: code:addons/account/installer.py:479 #, python-format msgid "SCNJ" @@ -8445,6 +8561,7 @@ msgstr "Followups Management" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8454,7 +8571,7 @@ msgid "Start Period" msgstr "Bắt đầu chu kỳ" #. module: account -#: code:addons/account/account.py:2333 +#: code:addons/account/account.py:2357 #, python-format msgid "Cannot locate parent code for template account!" msgstr "Cannot locate parent code for template account!" @@ -8492,7 +8609,7 @@ msgstr "" "Accountant validates the accounting entries coming from the invoice. " #. module: account -#: code:addons/account/invoice.py:1008 +#: code:addons/account/invoice.py:1014 #, python-format msgid "" "You cannot cancel the Invoice which is Partially Paid! You need to " @@ -8519,10 +8636,10 @@ msgstr "Document: Customer account statement" #. module: account #: constraint:account.move.line:0 msgid "You can not create move line on view account." -msgstr "" +msgstr "Bạn không thể tạo ra các dòng di chuyển vào tài khoản xem." #. module: account -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not confirured properly !" msgstr "Current currency is not confirured properly !" @@ -8535,6 +8652,10 @@ msgid "" "partially. You can easily generate refunds and reconcile them directly from " "the invoice form." msgstr "" +"Với Nhà cung cấp hoàn phí bạn có thể quản lý tín dụng các ghi chú mà bạn " +"nhận được từ nhà cung cấp của bạn. Hoàn là một tài liệu mà các khoản tín " +"dụng hoá đơn hoàn toàn hoặc một phần. Bạn có thể dễ dàng tạo ra hoàn và đối " +"chiếu trực tiếp từ các mẫu hoá đơn." #. module: account #: view:account.account.template:0 @@ -8571,6 +8692,7 @@ msgstr "Để trống để sử dụng tài khoản thu nhập" #: field:account.entries.report,balance:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8589,6 +8711,7 @@ msgstr "Manually or automatically entered in the system" #. module: account #: report:account.account.balance:0 +#: report:account.general.ledger_landscape:0 msgid "Display Account" msgstr "Hiển thị tài khoản" @@ -8688,6 +8811,12 @@ msgid "" "closed or left open depending on your company's activities over a specific " "period." msgstr "" +"Tại đây bạn có thể định nghĩa một khoảng thời gian tài chính, một khoảng " +"thời gian trong năm tài chính của công ty. Kỳ kế toán thông thường là một " +"tháng hoặc quý. Nó thường tương ứng với các giai đoạn của việc kê khai thuế. " +"Tạo và quản lý thời gian từ đây và quyết định có một khoảng thời gian cần " +"được đóng hoặc mở lại tùy thuộc vào các hoạt động của công ty bạn trong " +"khoảng thời gian cụ thể." #. module: account #: report:account.move.voucher:0 @@ -8710,6 +8839,7 @@ msgstr "Manual entry" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.line,move_id:0 #: field:analytic.entries.report,move_id:0 @@ -8717,7 +8847,7 @@ msgid "Move" msgstr "Move" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "You can not change the tax, you should remove and recreate lines !" @@ -8751,6 +8881,8 @@ msgid "" "You have to define the bank account\n" "in the journal definition for reconciliation." msgstr "" +"Bạn phải xác định các tài khoản ngân hàng\n" +"trong định nghĩa tạp chí cho hoà giải." #. module: account #: view:account.move.line.reconcile:0 @@ -8814,6 +8946,7 @@ msgstr "Account Analytic Balance" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8857,7 +8990,7 @@ msgid "Account Subscription" msgstr "Account Subscription" #. module: account -#: code:addons/account/invoice.py:717 +#: code:addons/account/invoice.py:725 #, python-format msgid "" "Tax base different !\n" @@ -8886,6 +9019,7 @@ msgstr "Entry Subscription" #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_start:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -8914,7 +9048,7 @@ msgid "Unreconciled" msgstr "Chưa được đối soát" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "Bad total !" msgstr "Tổng không hợp lệ !" @@ -8935,13 +9069,6 @@ msgid "" "open period. Close a period when you do not want to record new entries and " "want to lock this period for tax related calculation." msgstr "" -"A period is a fiscal period of time during which accounting entries should " -"be recorded for accounting related activities. Monthly period is the norm " -"but depending on your countries or company needs, you could also have " -"quarterly periods. Closing a period will make it impossible to record new " -"accounting entries, all new entries should then be made on the following " -"open period. Close a period when you do not want to record new entries and " -"want to lock this period for tax related calculation." #. module: account #: view:account.analytic.account:0 @@ -8979,13 +9106,13 @@ msgid "Active" msgstr "Đang hoạt động" #. module: account -#: code:addons/account/invoice.py:354 +#: code:addons/account/invoice.py:353 #, python-format msgid "Unknown Error" msgstr "Lỗi chưa biết" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "" "You cannot validate a non-balanced entry !\n" @@ -9033,10 +9160,10 @@ msgstr "Validate Account Move" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9081,6 +9208,9 @@ msgid "" "payment term!\n" "Please define partner on it!" msgstr "" +"Ngày đáo hạn của các dòng nhập được tạo ra bởi '% s' mô hình dựa trên dòng " +"thời hạn thanh toán đối tác!\n" +"Hãy xác định đối tác trên nó!" #. module: account #: field:account.cashbox.line,number:0 @@ -9126,7 +9256,7 @@ msgstr "Tổng quát" #: model:ir.ui.menu,name:account.next_id_23 #, python-format msgid "Periods" -msgstr "Periods" +msgstr "Các chu kỳ" #. module: account #: field:account.invoice.report,currency_rate:0 @@ -9232,6 +9362,8 @@ msgid "" "This report allows you to print or generate a pdf of your general ledger " "with details of all your account journals" msgstr "" +"Báo cáo này cho phép bạn in hay tạo ra một pdf của sổ cái của bạn với các " +"chi tiết của tất cả các tạp chí tài khoản của bạn" #. module: account #: selection:account.account,type:0 @@ -9281,7 +9413,6 @@ msgstr "Chọn chu kỳ" #: view:account.move:0 #: selection:account.move,state:0 #: view:account.move.line:0 -#: report:account.move.voucher:0 msgid "Posted" msgstr "Posted" @@ -9300,6 +9431,7 @@ msgstr "Posted" #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_stop:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -9353,10 +9485,11 @@ msgid "This is a model for recurring accounting entries" msgstr "This is a model for recurring accounting entries" #. module: account -#: code:addons/account/account_analytic_line.py:100 +#: code:addons/account/account_analytic_line.py:99 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "" +"Không có tài khoản thu nhập được xác định cho sản phẩm này: \"% s \" (id:% d)" #. module: account #: report:account.general.ledger:0 @@ -9396,7 +9529,7 @@ msgstr "Tổng" #: code:addons/account/wizard/account_move_journal.py:97 #, python-format msgid "Journal: All" -msgstr "" +msgstr "Journal: Tẩt cả" #. module: account #: field:account.account,company_id:0 @@ -9457,7 +9590,7 @@ msgstr "" #. module: account #: view:account.fiscalyear:0 msgid "Create Monthly Periods" -msgstr "Create Monthly Periods" +msgstr "Tạo các chu kỳ theo tháng" #. module: account #: field:account.tax.code.template,sign:0 @@ -9507,8 +9640,8 @@ msgid "End period" msgstr "Chu kỳ kết thúc" #. module: account -#: code:addons/account/account_move_line.py:738 -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:729 +#: code:addons/account/account_move_line.py:806 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_report_balance_sheet.py:70 @@ -9526,6 +9659,8 @@ msgid "" "This account will be used to value outgoing stock for the current product " "category using cost price" msgstr "" +"Tài khoản này sẽ được sử dụng để chứng khoán đi giá trị cho các loại sản " +"phẩm hiện tại bằng cách sử dụng giá" #. module: account #: report:account.move.voucher:0 @@ -9574,10 +9709,10 @@ msgstr "Hóa đơn nhà cung cấp" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9595,7 +9730,7 @@ msgstr "Invoice Lines" #. module: account #: constraint:account.account.template:0 msgid "Error ! You can not create recursive account templates." -msgstr "" +msgstr "Lỗi! Bạn không thể tạo tài khoản đệ quy mẫu." #. module: account #: constraint:account.account.template:0 @@ -9611,7 +9746,7 @@ msgid "Recurring" msgstr "Recurring" #. module: account -#: code:addons/account/account_move_line.py:805 +#: code:addons/account/account_move_line.py:796 #, python-format msgid "Entry is already reconciled" msgstr "Entry is already reconciled" @@ -9632,7 +9767,7 @@ msgid "Range" msgstr "Range" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "" "Can not create an automatic sequence for this piece !\n" @@ -9738,6 +9873,12 @@ msgid "" "may keep several types of specialized journals such as a cash journal, " "purchase journal, sales journal..." msgstr "" +"Tạo và quản lý tạp chí của công ty bạn từ trình đơn này. Một tạp chí được sử " +"dụng để ghi lại các giao dịch của tất cả các số liệu kế toán liên quan đến " +"việc kinh doanh hằng ngày của công ty của bạn sử dụng hệ thống sổ sách kế " +"toán kép. Tuỳ theo tính chất của các hoạt động của nó và số lượng giao dịch " +"hàng ngày, một công ty có thể giữ một số loại tạp chí chuyên ngành như một " +"tạp chí tiền mặt, tạp chí mua, tạp chí bán hàng ..." #. module: account #: model:ir.model,name:account.model_account_analytic_chart @@ -9767,7 +9908,7 @@ msgid "Accounts Mapping" msgstr "Accounts Mapping" #. module: account -#: code:addons/account/invoice.py:346 +#: code:addons/account/invoice.py:345 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "Hóa đơn '%s' đang chờ kiểm tra." @@ -9792,7 +9933,7 @@ msgid "The income or expense account related to the selected product." msgstr "The income or expense account related to the selected product." #. module: account -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1123 #, python-format msgid "The date of your Journal Entry is not in the defined period!" msgstr "The date of your Journal Entry is not in the defined period!" @@ -9912,6 +10053,8 @@ msgid "" "If the active field is set to False, it will allow you to hide the analytic " "journal without removing it." msgstr "" +"Nếu lĩnh vực hoạt động được thiết lập để sai, nó sẽ cho phép bạn ẩn các tạp " +"chí phân tích mà không cần loại bỏ nó." #. module: account #: field:account.analytic.line,ref:0 @@ -9997,7 +10140,7 @@ msgid "You must enter a period length that cannot be 0 or below !" msgstr "You must enter a period length that cannot be 0 or below !" #. module: account -#: code:addons/account/account.py:501 +#: code:addons/account/account.py:511 #, python-format msgid "You cannot remove an account which has account entries!. " msgstr "You cannot remove an account which has account entries!. " @@ -10013,6 +10156,13 @@ msgid "" "certain amount of information. They have to be certified by an external " "auditor annually." msgstr "" +"Tạo và quản lý các tài khoản mà bạn cần để ghi lại các mục nhật ký. Một tài " +"khoản là một phần của một sổ cái cho phép các công ty của bạn để đăng ký tất " +"cả các loại giao dịch thẻ ghi nợ và tín dụng. Các công ty hiện nay các tài " +"khoản hàng năm của họ trong hai phần chính: bảng cân đối và báo cáo thu nhập " +"(lợi nhuận và tài khoản thua lỗ). Các tài khoản hàng năm của một công ty " +"luật pháp yêu cầu tiết lộ một số tiền nhất định của thông tin. Họ phải có " +"xác nhận của kiểm toán viên bên ngoài hàng năm." #. module: account #: help:account.move.line,amount_residual_currency:0 @@ -10020,6 +10170,8 @@ msgid "" "The residual amount on a receivable or payable of a journal entry expressed " "in its currency (maybe different of the company currency)." msgstr "" +"Số tiền còn dư trên phải thu hoặc phải trả của một mục tạp chí thể hiện bằng " +"đồng tiền của mình (có thể khác nhau của các loại tiền tệ của công ty)." #~ msgid "Asset" #~ msgstr "Tài sản" diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 77cf968355b..9d95a5af4ba 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -263,7 +263,7 @@ class account_invoice(osv.osv): 'move_lines':fields.function(_get_lines, method=True, type='many2many', relation='account.move.line', string='Entry Lines'), 'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual', store={ - 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50), + 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','move_id'], 50), 'account.invoice.tax': (_get_invoice_tax, None, 50), 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 50), 'account.move.line': (_get_invoice_from_line, None, 50), diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 80508ede44b..c3117e60379 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -88,10 +88,10 @@ class account_balance(report_sxw.rml_parse, common_report_header): } self.sum_debit += account_rec['debit'] self.sum_credit += account_rec['credit'] - if disp_acc == 'bal_movement': + if disp_acc == 'movement': if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): self.result_acc.append(res) - elif disp_acc == 'bal_solde': + elif disp_acc == 'not_zero': if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): self.result_acc.append(res) else: diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 7c9aa13da2e..3d971862bdc 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -233,7 +233,7 @@ [[ get_fiscalyear(data) or '' ]] - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 79bcce882ae..b1e51e6fc46 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -137,16 +137,17 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) 'name': account.name, 'level': account.level, 'balance':account.balance, + 'type': account.type, } currency = account.currency_id and account.currency_id or account.company_id.currency_id if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_dr += account.balance if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += account.balance - if data['form']['display_account'] == 'bal_movement': + if data['form']['display_account'] == 'movement': if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account_dict) - elif data['form']['display_account'] == 'bal_solde': + elif data['form']['display_account'] == 'not_zero': if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account_dict) else: @@ -163,10 +164,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))): if i < len(cal_list['liability']) and i < len(cal_list['asset']): temp={ + 'type': cal_list['liability'][i]['type'], 'code': cal_list['liability'][i]['code'], 'name': cal_list['liability'][i]['name'], 'level': cal_list['liability'][i]['level'], 'balance':cal_list['liability'][i]['balance'], + 'type1': cal_list['asset'][i]['type'], 'code1': cal_list['asset'][i]['code'], 'name1': cal_list['asset'][i]['name'], 'level1': cal_list['asset'][i]['level'], @@ -176,10 +179,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) else: if i < len(cal_list['asset']): temp={ + 'type': '', 'code': '', 'name': '', 'level': False, 'balance':False, + 'type1': cal_list['asset'][i]['type'], 'code1': cal_list['asset'][i]['code'], 'name1': cal_list['asset'][i]['name'], 'level1': cal_list['asset'][i]['level'], @@ -188,10 +193,12 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) self.result_temp.append(temp) if i < len(cal_list['liability']): temp={ + 'type': cal_list['liability'][i]['type'], 'code': cal_list['liability'][i]['code'], 'name': cal_list['liability'][i]['name'], 'level': cal_list['liability'][i]['level'], 'balance':cal_list['liability'][i]['balance'], + 'type1': '', 'code1': '', 'name1': '', 'level1': False, diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 7fa92e9bcd1..205bfff497b 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -26,7 +26,6 @@ - @@ -115,7 +114,7 @@ - + @@ -124,6 +123,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -174,7 +203,7 @@ - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] [[ get_target_move(data) ]] @@ -187,35 +216,32 @@ - Assets + Assets - + Code - Assets + Account Balance - - - [[ repeatIn(get_lines_another('asset'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - - - [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]] - - - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]] - + + [[ repeatIn(get_lines_another('asset'),'a' ) ]] + [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]] + [[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]][[ a['code'] ]] + [[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]] + [[ (a['level'] <>2) or removeParentNode('td') ]][[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]] + [[ a['level'] == 2 or removeParentNode('td') ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]] @@ -235,7 +261,7 @@ - Liabilities + Liabilities @@ -245,22 +271,19 @@ Code - Liabilities + Account Balance - - - [[ repeatIn(get_lines_another('liability'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] [[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] - - - [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] - - - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]] - + + [[ repeatIn(get_lines_another('liability'),'a' ) ]] + [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a['level']))}) ]] + [[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_code'}) ]][[ a['code'] ]] + [[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a['level']))+'_name'}) ]][[ a['name'] ]] + [[ (a['level'] <>2) or removeParentNode('td') ]][[ (a['type'] =='view' and a['level'] >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a['level']))+'_balance'}) ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]] + [[ a['level'] == 2 or removeParentNode('td') ]][[ formatLang(a['balance']) ]] [[company.currency_id.symbol ]] diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index 96d437d3f00..7e4f9f844a5 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -163,7 +163,7 @@ - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] [[ get_target_move(data) ]] diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index a42f6bface8..294c7fa99cf 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -117,10 +117,10 @@ class general_ledger(report_sxw.rml_parse, common_report_header): num_entry = self.cr.fetchone()[0] or 0 sold_account = self._sum_balance_account(child_account) self.sold_accounts[child_account.id] = sold_account - if self.display_account == 'bal_movement': + if self.display_account == 'movement': if child_account.type != 'view' and num_entry <> 0: res.append(child_account) - elif self.display_account == 'bal_solde': + elif self.display_account == 'not_zero': if child_account.type != 'view' and num_entry <> 0: if not currency_obj.is_zero(self.cr, self.uid, currency, sold_account): res.append(child_account) diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 22712af0f8c..ac100c3ecd0 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -395,7 +395,7 @@ [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index ca444bb4eca..6c70bb47310 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -180,7 +180,7 @@ - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] [[ get_target_move(data) ]] diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index 740f7524975..4c8896ee630 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -101,6 +101,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): cal_list = {} account_id = data['form'].get('chart_account_id', False) + company_currency = account_pool.browse(self.cr, self.uid, account_id).company_id.currency_id account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx) accounts = account_pool.browse(cr, uid, account_ids, context=ctx) @@ -113,15 +114,18 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): self.result_sum_dr += account.debit - account.credit if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += account.credit - account.debit - if data['form']['display_account'] == 'bal_movement': + if data['form']['display_account'] == 'movement': if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account) - elif data['form']['display_account'] == 'bal_solde': + elif data['form']['display_account'] == 'not_zero': if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account) else: accounts_temp.append(account) - if self.result_sum_dr > self.result_sum_cr: + if currency_pool.is_zero(self.cr, self.uid, company_currency, (self.result_sum_dr-self.result_sum_cr)): + self.res_pl['type'] = None + self.res_pl['balance'] = 0.0 + elif self.result_sum_dr > self.result_sum_cr: self.res_pl['type'] = _('Net Loss') self.res_pl['balance'] = (self.result_sum_dr - self.result_sum_cr) else: diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index ca6be309556..2b29f479478 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -24,9 +24,8 @@ - + - @@ -41,17 +40,6 @@ - - - - - - - - - - - @@ -136,7 +124,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -156,7 +175,7 @@ Chart of Account Fiscal Year Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - Display Account + Display Account Target Moves @@ -184,42 +203,33 @@ - [[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] [[ get_target_move(data) ]] - - - + Expenses Code - Expenses + Account Balance - - - - [[ repeatIn(get_lines_another('expense'),'a' ) ]] [[ a.code ]][[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - - - - - [[ '. '*(a.level-1) ]][[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a.name ]] - - - - [[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a.balance) ]] [[ company.currency_id.symbol ]] - + + [[ repeatIn(get_lines_another('expense'),'a' ) ]] + [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]] + [[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]][[ a.code ]] + [[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]] + [[ (a.level <>2) or removeParentNode('td') ]][[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]] + [[ a.level == 2 or removeParentNode('td') ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]] @@ -249,32 +259,26 @@ - + Incomes + Code - Incomes + Account Balance - - - - [[ repeatIn(get_lines_another('income'),'a') ]] [[ a.code ]][[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] - - - - - [[ '. '*(a.level-1) ]][[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a.name ]] - - - - [[ a.level<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a.balance) ]] [[ company.currency_id.symbol ]] - + + [[ repeatIn(get_lines_another('income'),'a' ) ]] + [[ setTag('tr','tr',{'style': 'Table'+str(min(3,a.level))}) ]] + [[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_code_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_code'}) ]][[ a.code ]] + [[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_name_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(4,a.level))+'_name'}) ]][[ a.name ]] + [[ (a.level <>2) or removeParentNode('td') ]][[ (a.type =='view' and a.level >= 3) and setTag('para','para',{'style': 'terp_level_3_balance_bold'}) or setTag('para','para',{'style': 'terp_level_'+str(min(3,a.level))+'_balance'}) ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]] + [[ a.level == 2 or removeParentNode('td') ]][[ formatLang(a.balance) ]] [[company.currency_id.symbol ]] diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py index 9b364a55777..4d3ec449204 100644 --- a/addons/account/report/account_treasury_report.py +++ b/addons/account/report/account_treasury_report.py @@ -31,12 +31,13 @@ class account_treasury_report(osv.osv): def _compute_balances(self, cr, uid, ids, field_names, arg=None, context=None, query='', query_params=()): all_treasury_lines = self.search(cr, uid, [], context=context) - current_sum = 0 + all_companies = self.pool.get('res.company').search(cr, uid, [], context=context) + current_sum = dict((company, 0.0) for company in all_companies) res = dict((id, dict((fn, 0.0) for fn in field_names)) for id in all_treasury_lines) for record in self.browse(cr, uid, all_treasury_lines, context=context): - res[record.id]['starting_balance'] = current_sum - current_sum += record.balance - res[record.id]['ending_balance'] = current_sum + res[record.id]['starting_balance'] = current_sum[record.company_id.id] + current_sum[record.company_id.id] += record.balance + res[record.id]['ending_balance'] = current_sum[record.company_id.id] return res _columns = { diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 89e28950535..927f895bb3b 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -103,6 +103,14 @@ class account_fiscalyear_close(osv.osv_memory): if accnt_type_data.close_method=='none' or account.type == 'view': continue if accnt_type_data.close_method=='balance': + balance_in_currency = 0.0 + if account.currency_id: + cr.execute('SELECT sum(amount_currency) as balance_in_currency FROM account_move_line ' \ + 'WHERE account_id = %s ' \ + 'AND ' + query_line + ' ' \ + 'AND currency_id = %s', (account.id, account.currency_id.id)) + balance_in_currency = cr.dictfetchone()['balance_in_currency'] + if abs(account.balance)>0.0001: obj_acc_move_line.create(cr, uid, { 'debit': account.balance>0 and account.balance, @@ -111,7 +119,9 @@ class account_fiscalyear_close(osv.osv_memory): 'date': period.date_start, 'journal_id': new_journal.id, 'period_id': period.id, - 'account_id': account.id + 'account_id': account.id, + 'currency_id': account.currency_id and account.currency_id.id or False, + 'amount_currency': balance_in_currency, }, {'journal_id': new_journal.id, 'period_id':period.id}) if accnt_type_data.close_method == 'unreconciled': offset = 0 diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py index 18d3622b16c..873ede3832c 100644 --- a/addons/account/wizard/account_report_balance_sheet.py +++ b/addons/account/wizard/account_report_balance_sheet.py @@ -48,7 +48,7 @@ class account_bs_report(osv.osv_memory): } _defaults={ - 'display_type': True, + 'display_type': False, 'journal_ids': [], 'reserve_account_id': _get_def_reserve_account, } diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py index 0040d563bdd..4e0fe2d6c66 100644 --- a/addons/account/wizard/account_report_common_account.py +++ b/addons/account/wizard/account_report_common_account.py @@ -26,13 +26,13 @@ class account_common_account_report(osv.osv_memory): _description = 'Account Common Account Report' _inherit = "account.common.report" _columns = { - 'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'), - ('bal_solde','With balance is not equal to 0'), + 'display_account': fields.selection([('all','All'), ('movement','With movements'), + ('not_zero','With balance is not equal to 0'), ],'Display Accounts', required=True), } _defaults = { - 'display_account': 'bal_all', + 'display_account': 'movement', } def pre_print_report(self, cr, uid, ids, data, context=None): diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py index c526550e789..6372539c056 100644 --- a/addons/account/wizard/account_report_profit_loss.py +++ b/addons/account/wizard/account_report_profit_loss.py @@ -33,7 +33,7 @@ class account_pl_report(osv.osv_memory): } _defaults = { - 'display_type': True, + 'display_type': False, 'journal_ids': [], 'target_move': False } diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index e00353f28ce..5daaf4f4f3e 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -38,6 +38,7 @@ user rights to Demo user. "depends" : ["account"], 'update_xml': [ 'security/account_security.xml', + 'account_accountant_data.xml' ], 'demo_xml': ['account_accountant_demo.xml'], 'test': [], diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml new file mode 100644 index 00000000000..5962ae95dcd --- /dev/null +++ b/addons/account_accountant/account_accountant_data.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/addons/account_accountant/i18n/fi.po b/addons/account_accountant/i18n/fi.po new file mode 100644 index 00000000000..1e1c0a25072 --- /dev/null +++ b/addons/account_accountant/i18n/fi.po @@ -0,0 +1,33 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-22 05:51+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-23 04:56+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: account_accountant +#: model:ir.module.module,description:account_accountant.module_meta_information +msgid "" +"\n" +"This module gives the admin user the access to all the accounting features " +"like the journal\n" +"items and the chart of accounts.\n" +" " +msgstr "" + +#. module: account_accountant +#: model:ir.module.module,shortdesc:account_accountant.module_meta_information +msgid "Accountant" +msgstr "Kirjanpitäjä" diff --git a/addons/account_analytic_default/i18n/sr@latin.po b/addons/account_analytic_default/i18n/sr@latin.po index 7ca25d88a4f..fb334b46579 100644 --- a/addons/account_analytic_default/i18n/sr@latin.po +++ b/addons/account_analytic_default/i18n/sr@latin.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-23 15:15+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2011-06-04 19:05+0000\n" +"Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:25+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n" +"X-Generator: Launchpad (build 12959)\n" #. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information @@ -147,6 +147,15 @@ msgid "" "* Date\n" " " msgstr "" +"\n" +"Omogućava automatsko biranje analitičkih računa bazirano na " +"sl,kriterijumima:\n" +"*Proizvod\n" +"*Partner\n" +"*Korisnik\n" +"*Preduzeće\n" +"*Datum\n" +" " #. module: account_analytic_default #: help:account.analytic.default,product_id:0 @@ -201,7 +210,7 @@ msgstr "" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Redosled narudžbina" #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" diff --git a/addons/account_anglo_saxon/i18n/sr@latin.po b/addons/account_anglo_saxon/i18n/sr@latin.po index 62a74b9b1af..10b3a8cbb89 100644 --- a/addons/account_anglo_saxon/i18n/sr@latin.po +++ b/addons/account_anglo_saxon/i18n/sr@latin.po @@ -8,50 +8,51 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-10 15:54+0000\n" +"PO-Revision-Date: 2011-06-04 19:30+0000\n" "Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:42+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n" +"X-Generator: Launchpad (build 12959)\n" #. module: account_anglo_saxon #: view:product.category:0 msgid " Accounting Property" -msgstr "" +msgstr " Vlasništvo naloga" #. module: account_anglo_saxon #: sql_constraint:purchase.order:0 msgid "Order Reference must be unique !" -msgstr "" +msgstr "Referenca narudžbine mora biti jedinstvena !" #. module: account_anglo_saxon #: constraint:product.category:0 msgid "Error ! You can not create recursive categories." -msgstr "" +msgstr "Greška! Ne možete da napravite rekurzivne kategorije." #. module: account_anglo_saxon #: constraint:product.template:0 msgid "" "Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji." #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line msgid "Invoice Line" -msgstr "" +msgstr "Red računa" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_purchase_order msgid "Purchase Order" -msgstr "" +msgstr "Narudžbenica" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_product_template msgid "Product Template" -msgstr "" +msgstr "Šablon proizvoda" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_product_category @@ -61,23 +62,23 @@ msgstr "Kategorija Proizvoda" #. module: account_anglo_saxon #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information msgid "Stock Accounting for Anglo Saxon countries" -msgstr "" +msgstr "Lager koji važi za anglosaksonske zemlje" #. module: account_anglo_saxon #: field:product.category,property_account_creditor_price_difference_categ:0 #: field:product.template,property_account_creditor_price_difference:0 msgid "Price Difference Account" -msgstr "" +msgstr "Odnos u razlici cena" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Račun" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_stock_picking msgid "Picking List" -msgstr "" +msgstr "Lista ponuda" #. module: account_anglo_saxon #: model:ir.module.module,description:account_anglo_saxon.module_meta_information @@ -105,3 +106,5 @@ msgid "" "This account will be used to value price difference between purchase price " "and cost price." msgstr "" +"Ovaj nalog biće upotrebljen u svrhu određivanja vrednosti razlike između " +"nabavne i prodajne cene." diff --git a/addons/account_anglo_saxon/i18n/tr.po b/addons/account_anglo_saxon/i18n/tr.po index 08822391ec6..396c8ab8ab6 100644 --- a/addons/account_anglo_saxon/i18n/tr.po +++ b/addons/account_anglo_saxon/i18n/tr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-30 05:39+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-06-02 17:13+0000\n" +"Last-Translator: Ayhan KIZILTAN \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-31 04:47+0000\n" +"X-Launchpad-Export-Date: 2011-06-03 04:40+0000\n" "X-Generator: Launchpad (build 12959)\n" #. module: account_anglo_saxon @@ -98,6 +98,8 @@ msgid "" " Secondly, price differences between actual purchase price and fixed " "product standard price are booked on a separate account" msgstr "" +"Bu modül, Anglo-Saxon muhasebe yöntemini stok işlemleri yoluyla muhasebe \n" +" mantığını değştirerek destekleyecektir." #. module: account_anglo_saxon #: help:product.category,property_account_creditor_price_difference_categ:0 diff --git a/addons/account_cancel/i18n/sr@latin.po b/addons/account_cancel/i18n/sr@latin.po index 04c43bebea8..e067bc9d59e 100644 --- a/addons/account_cancel/i18n/sr@latin.po +++ b/addons/account_cancel/i18n/sr@latin.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-23 16:26+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2011-06-04 19:10+0000\n" +"Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:46+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n" +"X-Generator: Launchpad (build 12959)\n" #. module: account_cancel #: model:ir.module.module,description:account_cancel.module_meta_information @@ -26,9 +26,9 @@ msgid "" " " msgstr "" "\n" -" Modul adds omogucava polja za otkazivanje u formi pregleda dnevnika " -"konta. Ako je postavljeno na ' da' omogucava korisniku da otkaze stavke & " -"racune\n" +" Modul dodaje polje 'Omogući otkazivanje unosâ' u obliku pregleda " +"dnevnika naloga. Ako je podešen na 'istinito', omogućava korisniku da " +"otkazuje unose i račune.\n" " " #. module: account_cancel diff --git a/addons/account_chart/i18n/sr@latin.po b/addons/account_chart/i18n/sr@latin.po index 5e1ab3c83de..fbd53d83c42 100644 --- a/addons/account_chart/i18n/sr@latin.po +++ b/addons/account_chart/i18n/sr@latin.po @@ -8,21 +8,21 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-23 15:15+0000\n" -"Last-Translator: Dragan Životić \n" +"PO-Revision-Date: 2011-06-04 19:11+0000\n" +"Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:40+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n" +"X-Generator: Launchpad (build 12959)\n" #. module: account_chart #: model:ir.module.module,description:account_chart.module_meta_information msgid "Remove minimal account chart" -msgstr "Ukloni minimalnu kontnu tabelu" +msgstr "Ukloni minimalnu tabelu naloga" #. module: account_chart #: model:ir.module.module,shortdesc:account_chart.module_meta_information msgid "Charts of Accounts" -msgstr "" +msgstr "Tabele nalogâ" diff --git a/addons/account_coda/i18n/vi.po b/addons/account_coda/i18n/vi.po index f153607a1d1..c81c4dd2dfd 100644 --- a/addons/account_coda/i18n/vi.po +++ b/addons/account_coda/i18n/vi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-29 14:29+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-06-04 22:47+0000\n" +"Last-Translator: Nguyễn Thịnh \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-30 04:59+0000\n" +"X-Launchpad-Export-Date: 2011-06-06 04:37+0000\n" "X-Generator: Launchpad (build 12959)\n" #. module: account_coda @@ -114,7 +114,7 @@ msgstr "Người sử dụng" #: view:account.coda:0 #: field:account.coda,date:0 msgid "Date" -msgstr "" +msgstr "Ngày" #. module: account_coda #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po index 94e74684688..4e4ce7e1db9 100644 --- a/addons/account_followup/i18n/tr.po +++ b/addons/account_followup/i18n/tr.po @@ -7,25 +7,25 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-10-30 15:46+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2011-06-02 17:04+0000\n" +"Last-Translator: Ayhan KIZILTAN \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: 2011-04-29 05:03+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-03 04:39+0000\n" +"X-Generator: Launchpad (build 12959)\n" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:295 +#: code:addons/account_followup/wizard/account_followup_print.py:298 #, python-format msgid "Follwoup Summary" -msgstr "" +msgstr "İzleme Özeti" #. module: account_followup #: view:account_followup.followup:0 msgid "Search Followup" -msgstr "" +msgstr "İzleme Ara" #. module: account_followup #: model:ir.module.module,description:account_followup.module_meta_information @@ -51,11 +51,31 @@ msgid "" "Sent\n" "\n" msgstr "" +"\n" +" Çok seviyeli anımsatmalı ödenmemiş faturaları otomatize etmek için " +"kullanılan modüllerdir.\n" +"\n" +" Bu menüden anımsatmaların çoklu seviyelerini tanımlayabilirsiniz :\n" +" Muhasebe/Yapılandırma/Çeşitli/İzlemeler\n" +"\n" +" Bir kez tanımlandıktan sonra menüden basit bir tıklamayla\n" +" anımsatmaları hergün otomatik olarak yazdırabilirsiniz:\n" +" Muhasebe/Periyodik İşlemler/Faturalama/İzlemeleri Gönder\n" +"\n" +" Tanımlanan çeşitli seviyelere göre bütün mektupların birer PDF\n" +" suretlerini oluşturur. Farklı şirketler için farklı politikalar\n" +" tanımlayabilirsiniz. Müşteriye posta olarak ta gönderebilirsiniz.\n" +"\n" +" Eğer bir paydaş/hesap kaydı izleme seviyesini değiştirmek isterseniz, " +"bunu aşağıda belirtilen menüden yapabilirsiniz :\n" +" Muhasebe/Raporlama/Genel Raporlama/Paydaş Hesapları/Gönderilen " +"İzlemeler\n" +"\n" #. module: account_followup #: view:account_followup.stat:0 msgid "Group By..." -msgstr "Grupla..." +msgstr "Gruplandır..." #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:290 @@ -67,12 +87,17 @@ msgid "" "\n" "%s" msgstr "" +"\n" +"\n" +"Aşağıdaki Paydaşlara Eposta başarılı bir şekildegönderilmiştir. !\n" +"\n" +"%s" #. module: account_followup #: view:account_followup.followup:0 #: field:account_followup.followup,followup_line:0 msgid "Follow-Up" -msgstr "İş Takipçisi" +msgstr "İzleme" #. module: account_followup #: field:account_followup.followup,company_id:0 @@ -90,13 +115,14 @@ msgstr "Fatura Tarihi" #. module: account_followup #: field:account.followup.print.all,email_subject:0 msgid "Email Subject" -msgstr "E-Mail Konusu" +msgstr "Eposta Konusu" #. module: account_followup #: model:ir.actions.act_window,help:account_followup.action_followup_stat msgid "" "Follow up on the reminders sent over to your partners for unpaid invoices." msgstr "" +"Ödenmemiş faturalar için paydaşlarınıza gönderilen anımsatmaları izleyin." #. module: account_followup #: view:account.followup.print.all:0 @@ -112,38 +138,38 @@ msgstr "Tamam" #. module: account_followup #: view:account.followup.print.all:0 msgid "Select Partners to Remind" -msgstr "Hatırlatmak için İş Ortağı seç" +msgstr "Anımsatma yapılacak Paydaşı seç" #. module: account_followup #: constraint:account.move.line:0 msgid "You can not create move line on closed account." -msgstr "" +msgstr "Kapanmış bir hesap için hareket yaratamazsınız." #. module: account_followup #: field:account.followup.print,date:0 msgid "Follow-up Sending Date" -msgstr "İş Takibi Gönderim Tarihi" +msgstr "İzleme Gönderim Tarihi" #. module: account_followup #: sql_constraint:account.move.line:0 msgid "Wrong credit or debit value in accounting entry !" -msgstr "" +msgstr "Hesap girişindeki alacak ya da Borç değeri hatalı !" #. module: account_followup #: selection:account_followup.followup.line,start:0 msgid "Net Days" -msgstr "" +msgstr "Net Gün Sayısı" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form #: model:ir.ui.menu,name:account_followup.account_followup_menu msgid "Follow-Ups" -msgstr "İş Takipçisi" +msgstr "İzlemeler" #. module: account_followup #: view:account_followup.stat.by.partner:0 msgid "Balance > 0" -msgstr "" +msgstr "Bakiye > 0" #. module: account_followup #: view:account.move.line:0 @@ -153,18 +179,18 @@ msgstr "Toplam Borç" #. module: account_followup #: view:account.followup.print.all:0 msgid "%(heading)s: Move line header" -msgstr "" +msgstr "%(başlık)lar: Hareket kalemi başlığı" #. module: account_followup #: view:res.company:0 #: field:res.company,follow_up_msg:0 msgid "Follow-up Message" -msgstr "İş Takipçisi Mesajı" +msgstr "İzleme Mesajı" #. module: account_followup #: field:account.followup.print,followup_id:0 msgid "Follow-up" -msgstr "Takip" +msgstr "İzleme" #. module: account_followup #: report:account_followup.followup.print:0 @@ -176,7 +202,7 @@ msgstr "KDV :" #: field:account_followup.stat,partner_id:0 #: field:account_followup.stat.by.partner,partner_id:0 msgid "Partner" -msgstr "Ortak" +msgstr "Paydaş" #. module: account_followup #: report:account_followup.followup.print:0 @@ -186,18 +212,18 @@ msgstr "Tarih :" #. module: account_followup #: field:account.followup.print.all,partner_ids:0 msgid "Partners" -msgstr "Cari Kartlar" +msgstr "Paydaşlar" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:138 #, python-format msgid "Invoices Reminder" -msgstr "Fatura Hatırlatıcısı" +msgstr "Fatura Anımsatıcıs" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup msgid "Account Follow Up" -msgstr "Hesap Takibi" +msgstr "Hesap İzleme" #. module: account_followup #: selection:account_followup.followup.line,start:0 @@ -207,12 +233,12 @@ msgstr "Ay sonu" #. module: account_followup #: view:account_followup.stat:0 msgid "Not Litigation" -msgstr "" +msgstr "Dava açılmamış" #. module: account_followup #: view:account.followup.print.all:0 msgid "%(user_signature)s: User name" -msgstr "" +msgstr "%(kullanıcı_imzası)ları: Kullanıcı Adı" #. module: account_followup #: field:account_followup.stat,debit:0 @@ -226,6 +252,9 @@ msgid "" "You can send them the default message for unpaid invoices or manually enter " "a message should you need to remind them of a specific information." msgstr "" +"Bu özellik paydaşlarınızın bekleyen faturaları için anımsatma göndermenizi " +"sağlar. Ödenmeyen faturalar için varsayılan mesajı gönderebilir ya da özel " +"bir bilgiyi onlara anımsatmak için elle bir mesaj girebilirsiniz." #. module: account_followup #: report:account_followup.followup.print:0 @@ -235,24 +264,24 @@ msgstr "Ref" #. module: account_followup #: help:account_followup.followup.line,sequence:0 msgid "Gives the sequence order when displaying a list of follow-up lines." -msgstr "" +msgstr "İzleme satırlarını görüntülerken sıralamayı verir." #. module: account_followup #: view:account.followup.print.all:0 #: field:account.followup.print.all,email_body:0 msgid "Email body" -msgstr "Email Mesaj Alanı" +msgstr "Eposta gövdesi" #. module: account_followup #: field:account.move.line,followup_line_id:0 msgid "Follow-up Level" -msgstr "Takip Seviyesi" +msgstr "İzleme Seviyesi" #. module: account_followup #: field:account_followup.stat,date_followup:0 #: field:account_followup.stat.by.partner,date_followup:0 msgid "Latest followup" -msgstr "Son İş Takibi" +msgstr "Son İzleme" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line2 @@ -277,27 +306,46 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Sayın %(paydaş_adı)ları,\n" +"\n" +"Size bir anımsatma göndermemize karşın ödemenizin ciddi olarak geciktiğini " +"görmekten bizi hayal kırıklığına uğratmıştır.\n" +"\n" +"Acil olarak ödeme yapmanız gerekmektedir, aksi takdirde hesabınız kesilecek " +"olup firmanıza bundan sonra (malzeme/hizmet) satışı yapılmayacaktır.\n" +"Önümüzdeki 8 gün içerisinde, lütfen bu ödemenin yapılmasını sağlayın. \n" +"\n" +"Eğer bilmediğimiz bir sorun yüzünden bu ödeme yapılamıyorsa, lütfen muhasebe " +"bölümümüzle(+32).10.68.94.39. den ilişkiye geçmekten çekinmeyin ki bu soruna " +"hızlı bir şekilde çözüm bulalım.\n" +"\n" +"Geciken ödemenizle ilgili ayrıntılar aşağıda yazılmıştır.\n" +"\n" +"Saygılarımızla,\n" #. module: account_followup #: field:account.followup.print.all,partner_lang:0 msgid "Send Email in Partner Language" -msgstr "E-Maili Carinin Dilinde Gönder" +msgstr "Epostayı Paydaşın Dilinde Gönder" #. module: account_followup #: constraint:account.move.line:0 msgid "" "You can not create move line on receivable/payable account without partner" msgstr "" +"Bir paydaş belirtmeden alacak/borç hesabı için hareket satırı " +"oluşturmazsınız." #. module: account_followup #: view:account.followup.print.all:0 msgid "Partner Selection" -msgstr "Cari Seçimi" +msgstr "Paydaş Seçimi" #. module: account_followup #: field:account_followup.followup.line,description:0 msgid "Printed Message" -msgstr "" +msgstr "Yazılı Mesaj" #. module: account_followup #: view:account.followup.print:0 @@ -306,18 +354,18 @@ msgstr "" #: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all #: model:ir.ui.menu,name:account_followup.account_followup_print_menu msgid "Send followups" -msgstr "" +msgstr "İzlemeleri gönder" #. module: account_followup #: view:account_followup.stat.by.partner:0 msgid "Partner to Remind" -msgstr "" +msgstr "Anımsatma Gönderilecek Paydaş" #. module: account_followup #: field:account_followup.followup.line,followup_id:0 #: field:account_followup.stat,followup_id:0 msgid "Follow Ups" -msgstr "" +msgstr "İzlemeler" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line1 @@ -335,6 +383,19 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Sayın %(partner_name)lar,\n" +"\n" +"Aşağıda belirtilen tutar ödenmemiş görünmektedir, eğer bu bizim " +"yanlışlığımız ise lütfen bu yazımızı dikkate almayın. İleriki 8 gün " +"içersinde bu ödemenin yapılması için gereken hassasiyeti göstermenizi rica " +"ederiz.\n" +"\n" +"Bu yazımızın gönderilmesinden sonra ödeme yaptıysanız lütfen bu yazımızı " +"dikkate almayın. Muhasebe bölümüzle (+32).10.68.94.39. den görüşmekte lütfen " +"tereddüt etmeyin.\n" +"\n" +"Saygılarımızla,\n" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line3 @@ -355,37 +416,52 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Sayın %(partner_name)lar,\n" +"\n" +"Bir kaç kez anımsatmamıza rağmen hesabınız hala düzeltilmemiştir.\n" +"\n" +"Eğer 8 gün içerisinde tam ödeme yapılmazsa, bir daha haber vermeksizin bu " +"borcun ödenmesi için yasal yollara başvuracağımızı bilmenizi isteriz.\n" +"\n" +"Aşağıda belirtilen gecikmiş ödemenize ait bilgiler eminiz ki borcunuz " +"hakkında size tam bilgi vermektedir.\n" +"\n" +"Sorularınız için muhasebe bölümümüzle (+32).10.68.94.39 den iletişime " +"geçmekte terddüt etmeyiniz.\n" +"\n" +"Saygılarımızla,\n" #. module: account_followup #: view:account.followup.print.all:0 msgid "Send Mails" -msgstr "" +msgstr "Postaları Gönder" #. module: account_followup #: report:account_followup.followup.print:0 msgid "Currency" -msgstr "" +msgstr "Para Birimi" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner msgid "Followup Statistics by Partner" -msgstr "" +msgstr "Paydaşa göre İzleme İstatistikleri" #. module: account_followup #: model:ir.module.module,shortdesc:account_followup.module_meta_information msgid "Accounting follow-ups management" -msgstr "" +msgstr "Muhasebe İzleme Yönetimi" #. module: account_followup #: field:account_followup.stat,blocked:0 msgid "Blocked" -msgstr "" +msgstr "Engellendi" #. module: account_followup #: help:account.followup.print,date:0 msgid "" "This field allow you to select a forecast date to plan your follow-ups" -msgstr "" +msgstr "Bu alan izlemelerinizin öngörü planını yapmanızı sağlar." #. module: account_followup #: report:account_followup.followup.print:0 @@ -396,7 +472,7 @@ msgstr "Vade" #: code:addons/account_followup/wizard/account_followup_print.py:56 #, python-format msgid "Select Partners" -msgstr "" +msgstr "Paydaş Seçin" #. module: account_followup #: view:account.followup.print.all:0 @@ -406,7 +482,7 @@ msgstr "E-mail Ayarları" #. module: account_followup #: view:account.followup.print.all:0 msgid "Print Follow Ups" -msgstr "" +msgstr "İzlemeleri Yazdır" #. module: account_followup #: field:account.move.line,followup_date:0 @@ -426,7 +502,7 @@ msgstr "Bakiye:" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_stat msgid "Followup Statistics" -msgstr "" +msgstr "İzleme İstatistikleri" #. module: account_followup #: report:account_followup.followup.print:0 @@ -436,17 +512,17 @@ msgstr "Ödendi" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(user_signature)s: User Name" -msgstr "" +msgstr "%(kullanıcı_imza)lar: Kullanıcı Adı" #. module: account_followup #: model:ir.model,name:account_followup.model_account_move_line msgid "Journal Items" -msgstr "" +msgstr "Yevmiye Kalemleri" #. module: account_followup #: constraint:account.move.line:0 msgid "Company must be same for its related account and period." -msgstr "" +msgstr "Firma bağlı olduğu hesap ve dönemle aynı olmalıdır." #. module: account_followup #: field:account.followup.print.all,email_conf:0 @@ -461,11 +537,14 @@ msgid "" "\n" "%s" msgstr "" +"Tüm E-postalar başarılı bir şeklide şu Paydaşlara gönderilmiştir:.\n" +"\n" +"%s" #. module: account_followup #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "Hata! Yinelemeli şirketler oluşturamazsınız." #. module: account_followup #: view:account.followup.print.all:0 @@ -475,12 +554,12 @@ msgstr "%(company_name)s: Kullanıcının Firma Adı" #. module: account_followup #: model:ir.model,name:account_followup.model_res_company msgid "Companies" -msgstr "" +msgstr "Firmalar" #. module: account_followup #: view:account_followup.followup:0 msgid "Followup Lines" -msgstr "" +msgstr "İzleme Satırları" #. module: account_followup #: field:account_followup.stat,credit:0 @@ -490,12 +569,12 @@ msgstr "Alacak" #. module: account_followup #: report:account_followup.followup.print:0 msgid "Maturity Date" -msgstr "" +msgstr "Vade Sonu Tarihi" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(partner_name)s: Partner Name" -msgstr "" +msgstr "%(paydaş_adı)lar: Paydaş Adı" #. module: account_followup #: view:account_followup.stat:0 @@ -505,7 +584,7 @@ msgstr "İş Takipçisi Ögeleri" #. module: account_followup #: view:account.followup.print.all:0 msgid "%(company_currency)s: User's Company Currency" -msgstr "" +msgstr "%(firma_döviz)s: Kullanıcının Firmasının Para Birimi" #. module: account_followup #: view:account_followup.stat:0 @@ -517,29 +596,29 @@ msgstr "Bakiye" #. module: account_followup #: field:account_followup.followup.line,start:0 msgid "Type of Term" -msgstr "" +msgstr "Koşul Türü" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_print #: model:ir.model,name:account_followup.model_account_followup_print_all msgid "Print Followup & Send Mail to Customers" -msgstr "" +msgstr "İzlemeleri Yazdır ve Müşterilere Postala" #. module: account_followup #: field:account_followup.stat,date_move_last:0 #: field:account_followup.stat.by.partner,date_move_last:0 msgid "Last move" -msgstr "" +msgstr "Son Hareket" #. module: account_followup #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report msgid "Followup Report" -msgstr "" +msgstr "İzleme Raporu" #. module: account_followup #: field:account_followup.stat,period_id:0 msgid "Period" -msgstr "" +msgstr "Dönem" #. module: account_followup #: view:account.followup.print:0 @@ -555,33 +634,33 @@ msgstr "İş Takipçisi Ögeleri" #. module: account_followup #: view:account_followup.stat:0 msgid "Litigation" -msgstr "" +msgstr "Hukuki Dava" #. module: account_followup #: field:account_followup.stat.by.partner,max_followup_id:0 msgid "Max Follow Up Level" -msgstr "" +msgstr "En Üst İzleme Seviyesi" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all msgid "Payable Items" -msgstr "" +msgstr "Ödeme Maddeleri" #. module: account_followup #: view:account.followup.print.all:0 msgid "%(followup_amount)s: Total Amount Due" -msgstr "" +msgstr "%(izleme_tutar)lar: Ödenmesi Gereken Toplam Tutar" #. module: account_followup #: view:account.followup.print.all:0 #: view:account_followup.followup.line:0 msgid "%(date)s: Current Date" -msgstr "" +msgstr "%(tarih)ler: Geçerli Tarih" #. module: account_followup #: view:account_followup.stat:0 msgid "Followup Level" -msgstr "" +msgstr "İzleme Seviyesi" #. module: account_followup #: view:account_followup.followup:0 @@ -593,7 +672,7 @@ msgstr "Açıklama" #. module: account_followup #: view:account_followup.stat:0 msgid "This Fiscal year" -msgstr "" +msgstr "Bu Mali Yıl" #. module: account_followup #: view:account.move.line:0 @@ -606,18 +685,20 @@ msgid "" "Do not change message text, if you want to send email in partner language, " "or configure from company" msgstr "" +"Paydaşa dili ile eposta göndermek istiyorsanız mesaj metinini değiştirmeyin, " +"firma yapılandırmasını kullanın" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all msgid "Receivable Items" -msgstr "" +msgstr "Alacak Maddeleri" #. module: account_followup #: view:account_followup.stat:0 #: model:ir.actions.act_window,name:account_followup.action_followup_stat #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow msgid "Follow-ups Sent" -msgstr "" +msgstr "Gönderilen İzlemeler" #. module: account_followup #: field:account_followup.followup,name:0 @@ -629,17 +710,17 @@ msgstr "Adı" #: field:account_followup.stat,date_move:0 #: field:account_followup.stat.by.partner,date_move:0 msgid "First move" -msgstr "" +msgstr "İlk Hareket" #. module: account_followup #: report:account_followup.followup.print:0 msgid "Li." -msgstr "" +msgstr "Li." #. module: account_followup #: report:account_followup.followup.print:0 msgid "Maturity" -msgstr "" +msgstr "Vade" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:289 @@ -649,6 +730,9 @@ msgid "" "\n" "%s" msgstr "" +"Aşağıdaki Paydaşlara E-Posta gönderilmedi, Eposta yok !\n" +"\n" +"%s" #. module: account_followup #: view:account.followup.print:0 @@ -663,7 +747,7 @@ msgstr "Gecikme Günleri" #. module: account_followup #: report:account_followup.followup.print:0 msgid "Document : Customer account statement" -msgstr "" +msgstr "Belge: Müşteri hesap ekstresi" #. module: account_followup #: view:account.followup.print.all:0 @@ -679,7 +763,7 @@ msgstr "Toplam Alacak" #. module: account_followup #: view:account.followup.print.all:0 msgid "%(line)s: Ledger Posting lines" -msgstr "" +msgstr "%(satır)lar: Büyük Defter İşleme Kalemleri" #. module: account_followup #: field:account_followup.followup.line,sequence:0 @@ -689,32 +773,32 @@ msgstr "Sıra No" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(company_name)s: User's Company Name" -msgstr "" +msgstr "%(firma_adı)lar: Kullanıcının Firma Adı" #. module: account_followup #: report:account_followup.followup.print:0 msgid "Customer Ref :" -msgstr "" +msgstr "Müşteri Ref :" #. module: account_followup #: view:account.followup.print.all:0 msgid "%(partner_name)s: Partner name" -msgstr "" +msgstr "%(paydaş_adı)lar: Paydaş adı" #. module: account_followup #: view:account_followup.stat:0 msgid "Latest Followup Date" -msgstr "" +msgstr "Son İzleme Tarihi" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup_line msgid "Follow-Up Criteria" -msgstr "" +msgstr "İzleme Kriteri" #. module: account_followup #: constraint:account.move.line:0 msgid "You can not create move line on view account." -msgstr "" +msgstr "Hesap Görünümünde hareket oluşturamazsınız." #~ msgid "Invalid XML for View Architecture!" #~ msgstr "Görüntüleme mimarisi için Geçersiz XML" @@ -833,5 +917,21 @@ msgstr "" #~ msgstr "" #~ "\n" #~ "\n" -#~ "E-posta aşağıdaki İş Ortaklarına başarıyla gönderildi. !\n" +#~ "E-posta aşağıdaki Paydaşlara başarıyla gönderildi. !\n" +#~ "\n" + +#, python-format +#~ msgid "" +#~ "All E-mails have been successfully sent to Partners:.\n" +#~ "\n" +#~ msgstr "" +#~ "Bütün Epostalar Paydaşlara başarılı olarak gönderilmiştir.\n" +#~ "\n" + +#, python-format +#~ msgid "" +#~ "E-Mail not sent to following Partners, Email not available !\n" +#~ "\n" +#~ msgstr "" +#~ "Aşağıdaki Paydaşa E-Posta gönderilemedi. E-Posta bulunamadı !\n" #~ "\n" diff --git a/addons/account_payment/i18n/vi.po b/addons/account_payment/i18n/vi.po index 0954aadfbd0..ce9038a0c16 100644 --- a/addons/account_payment/i18n/vi.po +++ b/addons/account_payment/i18n/vi.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-12 19:47+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2011-06-04 22:07+0000\n" +"Last-Translator: Phong Nguyen-Thanh \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:21+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n" +"X-Generator: Launchpad (build 12959)\n" #. module: account_payment #: field:payment.order,date_scheduled:0 @@ -30,7 +30,7 @@ msgstr "Loại tiền của đối tác" #. module: account_payment #: view:payment.order:0 msgid "Set to draft" -msgstr "" +msgstr "Đặt thành Nháp" #. module: account_payment #: help:payment.order,mode:0 @@ -56,14 +56,14 @@ msgstr "" #. module: account_payment #: field:payment.order,line_ids:0 msgid "Payment lines" -msgstr "" +msgstr "Các dòng thanh toán" #. module: account_payment #: view:payment.line:0 #: field:payment.line,info_owner:0 #: view:payment.order:0 msgid "Owner Account" -msgstr "" +msgstr "Tài khoản Chủ sở hữu" #. module: account_payment #: help:payment.order,state:0 @@ -173,7 +173,7 @@ msgstr "" #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form msgid "Payment Orders" -msgstr "" +msgstr "Các Lệnh Thanh toán" #. module: account_payment #: selection:payment.order,date_prefered:0 @@ -186,7 +186,7 @@ msgstr "Trực tiếp" #: view:payment.line:0 #: view:payment.order:0 msgid "Payment Line" -msgstr "" +msgstr "Dòng Thanh toán" #. module: account_payment #: view:payment.line:0 @@ -262,12 +262,12 @@ msgstr "Lỗi !" #. module: account_payment #: view:account.move.line:0 msgid "Total debit" -msgstr "" +msgstr "Tổng nợ" #. module: account_payment #: field:payment.order,date_done:0 msgid "Execution date" -msgstr "" +msgstr "Ngày thực hiện" #. module: account_payment #: help:payment.mode,journal:0 @@ -293,7 +293,7 @@ msgstr "Tài khoản đích" #. module: account_payment #: view:payment.order:0 msgid "Search Payment Orders" -msgstr "" +msgstr "Tìm kiếm các Lệnh Thanh toán" #. module: account_payment #: constraint:account.move.line:0 @@ -467,7 +467,7 @@ msgstr "Tìm kiếm" #: model:ir.actions.report.xml,name:account_payment.payment_order1 #: model:ir.model,name:account_payment.model_payment_order msgid "Payment Order" -msgstr "" +msgstr "Lệnh thanh toán" #. module: account_payment #: field:payment.line,date:0 @@ -613,7 +613,7 @@ msgstr "" #: view:payment.mode:0 #: field:payment.mode,journal:0 msgid "Journal" -msgstr "" +msgstr "Sổ nhật ký" #. module: account_payment #: field:payment.mode,bank_id:0 diff --git a/addons/account_sequence/i18n/nb.po b/addons/account_sequence/i18n/nb.po new file mode 100644 index 00000000000..f77793fcb3e --- /dev/null +++ b/addons/account_sequence/i18n/nb.po @@ -0,0 +1,221 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-24 11:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-25 04:59+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: account_sequence +#: view:account.sequence.installer:0 +#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer +msgid "Account Sequence Application Configuration" +msgstr "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create entries on different periods/journals in the same move" +msgstr "" + +#. module: account_sequence +#: help:account.move,internal_sequence_number:0 +#: help:account.move.line,internal_sequence_number:0 +msgid "Internal Sequence Number" +msgstr "Internt sekvensnummer" + +#. module: account_sequence +#: help:account.sequence.installer,number_next:0 +msgid "Next number of this sequence" +msgstr "Neste nummer på denne sekvensen" + +#. module: account_sequence +#: field:account.sequence.installer,number_next:0 +msgid "Next Number" +msgstr "Neste nummer" + +#. module: account_sequence +#: field:account.sequence.installer,number_increment:0 +msgid "Increment Number" +msgstr "" + +#. module: account_sequence +#: model:ir.module.module,description:account_sequence.module_meta_information +msgid "" +"\n" +" This module maintains internal sequence number for accounting entries.\n" +" " +msgstr "" + +#. module: account_sequence +#: model:ir.module.module,shortdesc:account_sequence.module_meta_information +msgid "Entries Sequence Numbering" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,number_increment:0 +msgid "The next number of the sequence will be incremented by this number" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure Your Account Sequence Application" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,progress:0 +msgid "Configuration Progress" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,suffix:0 +msgid "Suffix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,company_id:0 +msgid "Company" +msgstr "" + +#. module: account_sequence +#: help:account.journal,internal_sequence_id:0 +msgid "" +"This sequence will be used to maintain the internal number for the journal " +"entries related to this journal." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,padding:0 +msgid "Number padding" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_sequence +#: field:account.move,internal_sequence_number:0 +#: field:account.move.line,internal_sequence_number:0 +msgid "Internal Number" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "Company must be same for its related account and period." +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,padding:0 +msgid "" +"OpenERP will automatically adds some '0' on the left of the 'Next Number' to " +"get the required padding size." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,name:0 +msgid "Name" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on closed account." +msgstr "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create more than one move per period on centralized journal" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "" + +#. module: account_sequence +#: field:account.journal,internal_sequence_id:0 +msgid "Internal Sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_sequence_installer +msgid "account.sequence.installer" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,prefix:0 +msgid "Prefix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move +msgid "Account Entry" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,suffix:0 +msgid "Suffix" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,config_logo:0 +msgid "Image" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "title" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,prefix:0 +msgid "Prefix" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "" +"You can not create move line on receivable/payable account without partner" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_journal +msgid "Journal" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "You can enhance the Account Sequence Application by installing ." +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on view account." +msgstr "" diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po index 994503f1842..28940ce2349 100644 --- a/addons/account_voucher/i18n/pt_BR.po +++ b/addons/account_voucher/i18n/pt_BR.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: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-24 18:06+0000\n" -"Last-Translator: Adriano Prado \n" +"PO-Revision-Date: 2011-06-04 21:23+0000\n" +"Last-Translator: Emerson \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: 2011-04-29 05:33+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-05 04:35+0000\n" +"X-Generator: Launchpad (build 12959)\n" #. module: account_voucher #: view:account.voucher.unreconcile:0 @@ -22,10 +22,10 @@ msgid "Unreconciliation transactions" msgstr "Transações não conciliadas" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:242 +#: code:addons/account_voucher/account_voucher.py:247 #, python-format msgid "Write-Off" -msgstr "" +msgstr "Ajuste" #. module: account_voucher #: view:account.voucher:0 @@ -54,7 +54,7 @@ msgid "Group By..." msgstr "Agrupar Por..." #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:591 +#: code:addons/account_voucher/account_voucher.py:596 #, python-format msgid "Cannot delete Voucher(s) which are already opened or paid !" msgstr "Impossível apagar Comprovante(s) ja Abertos ou Pagos !" @@ -88,7 +88,7 @@ msgid "Bill Payment" msgstr "Pagamento de Conta" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:741 +#: code:addons/account_voucher/account_voucher.py:746 #, python-format msgid "" "You have to configure account base code and account tax code on the '%s' tax!" @@ -302,7 +302,7 @@ msgstr "Valor (por extenso)" #: view:sale.receipt.report:0 #: field:sale.receipt.report,nbr:0 msgid "# of Voucher Lines" -msgstr "" +msgstr "# de Linhas do Comprovante" #. module: account_voucher #: field:account.voucher.line,account_analytic_id:0 @@ -348,12 +348,12 @@ msgstr "Na Conta de:" #. module: account_voucher #: field:account.voucher,writeoff_amount:0 msgid "Write-Off Amount" -msgstr "" +msgstr "Valor do Ajuste" #. module: account_voucher #: view:account.voucher:0 msgid "Sales Lines" -msgstr "" +msgstr "Linhas das Vendas" #. module: account_voucher #: report:voucher.print:0 @@ -387,7 +387,7 @@ msgstr "Tipo" #. module: account_voucher #: field:account.voucher.unreconcile,remove:0 msgid "Want to remove accounting entries too ?" -msgstr "" +msgstr "Deseja remover os lançamentos contábeis também?" #. module: account_voucher #: view:account.voucher:0 @@ -396,7 +396,7 @@ msgid "Voucher Entries" msgstr "Lançamento de Comprovantes" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:640 +#: code:addons/account_voucher/account_voucher.py:645 #, python-format msgid "Error !" msgstr "Erro !" @@ -421,10 +421,10 @@ msgstr "Comentário" #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt msgid "Sales Receipt" -msgstr "" +msgstr "Recibo de Vendas" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:591 +#: code:addons/account_voucher/account_voucher.py:596 #, python-format msgid "Invalid action !" msgstr "Ação invalida !" @@ -432,7 +432,7 @@ msgstr "Ação invalida !" #. module: account_voucher #: view:account.voucher:0 msgid "Bill Information" -msgstr "" +msgstr "Informação de Cobrança" #. module: account_voucher #: selection:sale.receipt.report,month:0 @@ -442,7 +442,7 @@ msgstr "Julho" #. module: account_voucher #: view:account.voucher.unreconcile:0 msgid "Unreconciliation" -msgstr "" +msgstr "Desconciliação" #. module: account_voucher #: view:sale.receipt.report:0 @@ -458,7 +458,7 @@ msgid "Pay Invoice" msgstr "Pagar Fatura" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:741 +#: code:addons/account_voucher/account_voucher.py:746 #, python-format msgid "No Account Base Code and Account Tax Code!" msgstr "Sem conta para Base e Imposto!" @@ -517,6 +517,7 @@ msgstr "Dezembro" #. module: account_voucher #: field:account.voucher,line_ids:0 +#: view:account.voucher.line:0 #: model:ir.model,name:account_voucher.model_account_voucher_line msgid "Voucher Lines" msgstr "Linhas do Comprovante" @@ -568,7 +569,7 @@ msgstr "Provisório" #. module: account_voucher #: field:account.voucher,writeoff_acc_id:0 msgid "Write-Off account" -msgstr "" +msgstr "Conta de ajuste" #. module: account_voucher #: report:voucher.print:0 @@ -665,7 +666,7 @@ msgstr "Valor Reconciliado" #. module: account_voucher #: field:account.voucher,analytic_id:0 msgid "Write-Off Analytic Account" -msgstr "" +msgstr "Conta Analítica dos Ajustes" #. module: account_voucher #: selection:account.voucher,pay_now:0 @@ -705,7 +706,7 @@ msgid "Credit" msgstr "Crédito" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:640 +#: code:addons/account_voucher/account_voucher.py:645 #, python-format msgid "Please define a sequence on the journal !" msgstr "Favor definir a seqüencia no Livro !" @@ -745,7 +746,7 @@ msgstr "Total sem Impostos" #. module: account_voucher #: view:account.voucher:0 msgid "Bill Date" -msgstr "" +msgstr "Data de Cobrança" #. module: account_voucher #: help:account.voucher,state:0 @@ -869,7 +870,7 @@ msgstr "Quer Confirmar este Registro ?" #. module: account_voucher #: selection:account.voucher,payment_option:0 msgid "Reconcile with Write-Off" -msgstr "" +msgstr "Reconciliar com Ajuste" #. module: account_voucher #: view:account.voucher:0 @@ -959,7 +960,7 @@ msgstr "Faturas e Transações de Fornecedores Pendentes" #. module: account_voucher #: field:account.voucher,comment:0 msgid "Write-Off Comment" -msgstr "" +msgstr "Comentário do Ajuste" #. module: account_voucher #: selection:sale.receipt.report,month:0 diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 6dfaac21e70..d822c382c91 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -202,8 +202,8 @@ class account_analytic_account(osv.osv): 'currency_id': _get_default_currency, } - def check_recursion(self, cr, uid, ids, parent=None): - return super(account_analytic_account, self)._check_recursion(cr, uid, ids, parent=parent) + def check_recursion(self, cr, uid, ids, context=None, parent=None): + return super(account_analytic_account, self)._check_recursion(cr, uid, ids, context=context, parent=parent) _order = 'name asc' _constraints = [ diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index ffda564cb8e..bfa6bca8f34 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -20,7 +20,7 @@ ############################################################################## from osv import fields, osv -from osv.osv import osv_pool, object_proxy +from osv.osv import object_proxy from tools.translate import _ import pooler import time diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 2a4e2c0e4e1..80c1ab464f1 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -487,21 +487,24 @@ base_action_rule() class ir_cron(osv.osv): - _inherit = 'ir.cron' - + _inherit = 'ir.cron' + _init_done = False + def _poolJobs(self, db_name, check=False): - try: - db = pooler.get_db(db_name) - except: - return False - cr = db.cursor() - try: - next = datetime.now().strftime('%Y-%m-%d %H:00:00') - # Putting nextcall always less than current time in order to call it every time - cr.execute('UPDATE ir_cron set nextcall = \'%s\' where numbercall<>0 and active and model=\'base.action.rule\' ' % (next)) - finally: - cr.commit() - cr.close() + if not self._init_done: + self._init_done = True + try: + db = pooler.get_db(db_name) + except: + return False + cr = db.cursor() + try: + next = datetime.now().strftime('%Y-%m-%d %H:00:00') + # Putting nextcall always less than current time in order to call it every time + cr.execute('UPDATE ir_cron set nextcall = \'%s\' where numbercall<>0 and active and model=\'base.action.rule\' ' % (next)) + finally: + cr.commit() + cr.close() super(ir_cron, self)._poolJobs(db_name, check=check) diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po index 2237e4ba73f..ba228085c56 100644 --- a/addons/base_calendar/i18n/tr.po +++ b/addons/base_calendar/i18n/tr.po @@ -8,20 +8,20 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-23 18:46+0000\n" +"PO-Revision-Date: 2011-06-23 19:26+0000\n" "Last-Translator: Ayhan KIZILTAN \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-29 05:50+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-24 05:00+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 #: selection:res.alarm,trigger_related:0 msgid "The event starts" -msgstr "Olay Başlar" +msgstr "Etkinlik Başlar" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 @@ -31,7 +31,7 @@ msgstr "Saatlik" #. module: base_calendar #: view:calendar.attendee:0 msgid "Required to Join" -msgstr "Katılmak gerekir" +msgstr "Katılım Gerekir" #. module: base_calendar #: help:calendar.event,exdate:0 @@ -46,19 +46,19 @@ msgstr "" #. module: base_calendar #: constraint:res.users:0 msgid "The chosen company is not in the allowed companies for this user" -msgstr "" +msgstr "Seçilen firma bu kullanıcı için izin verilen şirketler arasında yok" #. module: base_calendar #: field:calendar.event.edit.all,name:0 msgid "Title" -msgstr "Başlık" +msgstr "Unvan" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,rrule_type:0 #: selection:calendar.todo,rrule_type:0 msgid "Monthly" -msgstr "" +msgstr "Aylık" #. module: base_calendar #: view:calendar.attendee:0 @@ -68,7 +68,7 @@ msgstr "Davetli Kullanıcı" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation" -msgstr "" +msgstr "Davet" #. module: base_calendar #: help:calendar.event,recurrency:0 @@ -80,20 +80,20 @@ msgstr "Yinelenen Toplantı" #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm msgid "Alarms" -msgstr "" +msgstr "Alarmlar" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Sunday" -msgstr "" +msgstr "Pazar" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,role:0 msgid "Role" -msgstr "" +msgstr "Rol" #. module: base_calendar #: view:calendar.attendee:0 @@ -106,13 +106,13 @@ msgstr "Davet Detayları" #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Fourth" -msgstr "" +msgstr "Dördüncü" #. module: base_calendar #: field:calendar.event,show_as:0 #: field:calendar.todo,show_as:0 msgid "Show as" -msgstr "Farklı Göster" +msgstr "Göster" #. module: base_calendar #: field:base.calendar.set.exrule,day:0 @@ -122,13 +122,13 @@ msgstr "Farklı Göster" #: field:calendar.todo,day:0 #: selection:calendar.todo,select1:0 msgid "Date of month" -msgstr "" +msgstr "Ayın Günü" #. module: base_calendar #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Public" -msgstr "Herkese açık" +msgstr "Genel" #. module: base_calendar #: view:calendar.event:0 @@ -140,33 +140,34 @@ msgstr " " #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "March" -msgstr "" +msgstr "Mart" #. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:414 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90 #, python-format msgid "Warning !" -msgstr "" +msgstr "Uyarı !" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Friday" -msgstr "" +msgstr "Cuma" #. module: base_calendar #: field:calendar.event,allday:0 #: field:calendar.todo,allday:0 msgid "All Day" -msgstr "" +msgstr "Tüm Gün" #. module: base_calendar #: field:base.calendar.set.exrule,select1:0 #: field:calendar.event,select1:0 #: field:calendar.todo,select1:0 msgid "Option" -msgstr "" +msgstr "Seçenek" #. module: base_calendar #: selection:calendar.attendee,availability:0 @@ -174,76 +175,76 @@ msgstr "" #: selection:calendar.todo,show_as:0 #: selection:res.users,availability:0 msgid "Free" -msgstr "" +msgstr "Serbest" #. module: base_calendar #: help:calendar.attendee,rsvp:0 msgid "Indicats whether the favor of a reply is requested" -msgstr "" +msgstr "Bir yanıtın onaylanmasının gerekip gerekmediğini belirtir." #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_attachment msgid "ir.attachment" -msgstr "" +msgstr "ir.ek" #. module: base_calendar #: help:calendar.attendee,delegated_to:0 msgid "The users that the original request was delegated to" -msgstr "" +msgstr "Kullanıcıların yetkilendirildiği asıl istek" #. module: base_calendar #: field:calendar.attendee,ref:0 msgid "Event Ref" -msgstr "" +msgstr "Etkinlik Ref" #. module: base_calendar #: field:base.calendar.set.exrule,we:0 #: field:calendar.event,we:0 #: field:calendar.todo,we:0 msgid "Wed" -msgstr "" +msgstr "Çar" #. module: base_calendar #: view:calendar.event:0 msgid "Show time as" -msgstr "" +msgstr "Saati şöyle göster" #. module: base_calendar #: field:base.calendar.set.exrule,tu:0 #: field:calendar.event,tu:0 #: field:calendar.todo,tu:0 msgid "Tue" -msgstr "" +msgstr "Sa" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,rrule_type:0 #: selection:calendar.todo,rrule_type:0 msgid "Yearly" -msgstr "" +msgstr "Yıllık" #. module: base_calendar #: selection:calendar.alarm,trigger_related:0 #: selection:res.alarm,trigger_related:0 msgid "The event ends" -msgstr "" +msgstr "Etkinlik biter" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Last" -msgstr "" +msgstr "Sonuncu" #. module: base_calendar #: help:calendar.attendee,state:0 msgid "Status of the attendee's participation" -msgstr "" +msgstr "Katılımcının iştirak durumu" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Room" -msgstr "" +msgstr "Oda" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -251,83 +252,83 @@ msgstr "" #: selection:calendar.todo,freq:0 #: selection:res.alarm,trigger_interval:0 msgid "Days" -msgstr "" +msgstr "Günler" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Invitation Detail" -msgstr "" +msgstr "Davet Ayrıntısı" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:1356 +#: code:addons/base_calendar/base_calendar.py:1355 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136 #, python-format msgid "Error!" -msgstr "" +msgstr "Hata!" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "Chair Person" -msgstr "" +msgstr "Başkan" #. module: base_calendar #: selection:calendar.alarm,action:0 msgid "Procedure" -msgstr "" +msgstr "Yöntem" #. module: base_calendar #: selection:calendar.event,state:0 #: selection:calendar.todo,state:0 msgid "Cancelled" -msgstr "" +msgstr "Vazgeçildi" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 #: selection:res.alarm,trigger_interval:0 msgid "Minutes" -msgstr "" +msgstr "Dakikalar" #. module: base_calendar #: selection:calendar.alarm,action:0 msgid "Display" -msgstr "" +msgstr "Göster" #. module: base_calendar #: view:calendar.event.edit.all:0 msgid "Edit all Occurrences" -msgstr "" +msgstr "Bütün olayları düzenle" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation type" -msgstr "" +msgstr "Davet türü" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 msgid "Secondly" -msgstr "" +msgstr "İkinci olarak" #. module: base_calendar #: field:calendar.alarm,event_date:0 #: field:calendar.attendee,event_date:0 #: view:calendar.event:0 msgid "Event Date" -msgstr "" +msgstr "Etkinlik Tarihi" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Group By..." -msgstr "" +msgstr "Gruplandır..." #. module: base_calendar #: help:base_calendar.invite.attendee,email:0 msgid "Provide external email address who will receive this invitation." -msgstr "" +msgstr "Bu daveti alacak olanın dış eposta adresini verin." #. module: base_calendar #: model:ir.module.module,description:base_calendar.module_meta_information @@ -338,42 +339,47 @@ msgid "" " - Recurring events\n" " - Invitations to people" msgstr "" +"Çok özellikli takvim sistemi şunları destekler:\n" +" - Takvim etkinlikleri\n" +" - Uyarılar (istekler oluşturun)\n" +" - Yinelenen etkinlikler\n" +" - Kişilerin davet edilmesi" #. module: base_calendar #: help:calendar.attendee,cutype:0 msgid "Specify the type of Invitation" -msgstr "" +msgstr "Davet türünü belirle" #. module: base_calendar #: selection:calendar.event,freq:0 #: selection:calendar.todo,freq:0 msgid "Years" -msgstr "" +msgstr "Yıl" #. module: base_calendar #: field:calendar.alarm,event_end_date:0 #: field:calendar.attendee,event_end_date:0 msgid "Event End Date" -msgstr "" +msgstr "Etkinlik Bitiş Tarihi" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "Optional Participation" -msgstr "" +msgstr "Seçime bağlı Katılım" #. module: base_calendar #: field:calendar.event,date_deadline:0 #: field:calendar.todo,date_deadline:0 msgid "Deadline" -msgstr "" +msgstr "Bitiş tarihi" #. module: base_calendar #: code:addons/base_calendar/base_calendar.py:385 +#: code:addons/base_calendar/base_calendar.py:1088 #: code:addons/base_calendar/base_calendar.py:1090 -#: code:addons/base_calendar/base_calendar.py:1092 #, python-format msgid "Warning!" -msgstr "" +msgstr "Uyarı!" #. module: base_calendar #: help:calendar.event,active:0 @@ -382,11 +388,13 @@ msgid "" "If the active field is set to true, it will allow you to hide the " "event alarm information without removing it." msgstr "" +"Eğer etkin alan doğru olarak ayarlıysa, etkinlik alarmını silmeden " +"gizleyebilirsiniz." #. module: base_calendar #: model:ir.module.module,shortdesc:base_calendar.module_meta_information msgid "Basic Calendar Functionality" -msgstr "" +msgstr "Temel Takvim İşlevselliği" #. module: base_calendar #: field:calendar.event,organizer:0 @@ -394,7 +402,7 @@ msgstr "" #: field:calendar.todo,organizer:0 #: field:calendar.todo,organizer_id:0 msgid "Organizer" -msgstr "" +msgstr "Düzenleyen" #. module: base_calendar #: view:calendar.attendee:0 @@ -402,88 +410,88 @@ msgstr "" #: field:calendar.event,user_id:0 #: field:calendar.todo,user_id:0 msgid "Responsible" -msgstr "" +msgstr "Sorumlu" #. module: base_calendar #: view:calendar.event:0 #: model:res.request.link,name:base_calendar.request_link_meeting msgid "Event" -msgstr "" +msgstr "Etkinlik" #. module: base_calendar #: help:calendar.event,edit_all:0 #: help:calendar.todo,edit_all:0 msgid "Edit all Occurrences of recurrent Meeting." -msgstr "" +msgstr "Yinelenen Toplantıya ait bütün Olayları Düzenle." #. module: base_calendar #: selection:calendar.alarm,trigger_occurs:0 #: selection:res.alarm,trigger_occurs:0 msgid "Before" -msgstr "" +msgstr "Önce" #. module: base_calendar #: view:calendar.event:0 #: selection:calendar.event,state:0 #: selection:calendar.todo,state:0 msgid "Confirmed" -msgstr "" +msgstr "Onaylandı" #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all msgid "Edit all events" -msgstr "" +msgstr "Bütün etkinlikleri düzenle" #. module: base_calendar #: field:calendar.alarm,attendee_ids:0 #: field:calendar.event,attendee_ids:0 #: field:calendar.todo,attendee_ids:0 msgid "Attendees" -msgstr "" +msgstr "Katılımcılar" #. module: base_calendar #: view:calendar.event:0 msgid "Confirm" -msgstr "" +msgstr "Onayla" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_todo msgid "Calendar Task" -msgstr "" +msgstr "Takvim Görevleri" #. module: base_calendar #: field:base.calendar.set.exrule,su:0 #: field:calendar.event,su:0 #: field:calendar.todo,su:0 msgid "Sun" -msgstr "" +msgstr "Paz" #. module: base_calendar #: field:calendar.attendee,cutype:0 msgid "Invite Type" -msgstr "" +msgstr "Davet Türü" #. module: base_calendar #: help:calendar.attendee,partner_id:0 msgid "Partner related to contact" -msgstr "" +msgstr "İlgiliye ait paydaş" #. module: base_calendar #: view:res.alarm:0 msgid "Reminder details" -msgstr "" +msgstr "Anımsatma Ayrıntıları" #. module: base_calendar #: field:calendar.attendee,parent_ids:0 msgid "Delegrated From" -msgstr "" +msgstr "Tarafından Yetkilendirldi" #. module: base_calendar #: selection:base.calendar.set.exrule,select1:0 #: selection:calendar.event,select1:0 #: selection:calendar.todo,select1:0 msgid "Day of month" -msgstr "" +msgstr "Ayın günü" #. module: base_calendar #: view:calendar.event:0 @@ -491,48 +499,48 @@ msgstr "" #: field:calendar.event.edit.all,location:0 #: field:calendar.todo,location:0 msgid "Location" -msgstr "" +msgstr "Konum" #. module: base_calendar #: field:base_calendar.invite.attendee,send_mail:0 msgid "Send mail?" -msgstr "" +msgstr "Posta gönderilsin mi?" #. module: base_calendar #: field:base_calendar.invite.attendee,email:0 #: selection:calendar.alarm,action:0 #: field:calendar.attendee,email:0 msgid "Email" -msgstr "" +msgstr "Eposta" #. module: base_calendar #: view:calendar.attendee:0 msgid "Event Detail" -msgstr "" +msgstr "Etkinlik Ayrıntısı" #. module: base_calendar #: selection:calendar.alarm,state:0 msgid "Run" -msgstr "" +msgstr "Çalıştır" #. module: base_calendar #: field:calendar.event,exdate:0 #: field:calendar.todo,exdate:0 msgid "Exception Date/Times" -msgstr "" +msgstr "İtiraz Tarihi/Süresi" #. module: base_calendar #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Confidential" -msgstr "" +msgstr "Gizli" #. module: base_calendar #: field:base.calendar.set.exrule,end_date:0 #: field:calendar.event,end_date:0 #: field:calendar.todo,end_date:0 msgid "Repeat Until" -msgstr "" +msgstr "kadar tekrarla" #. module: base_calendar #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view @@ -540,286 +548,288 @@ msgid "" "Create specific calendar alarms that may be assigned to calendar events or " "meetings." msgstr "" +"Takvim etkinliklerine ve toplantılarına atanabilecek özel takvim alarmları " +"oluştur." #. module: base_calendar #: view:calendar.event:0 msgid "Visibility" -msgstr "" +msgstr "Görünürlük" #. module: base_calendar #: field:calendar.attendee,rsvp:0 msgid "Required Reply?" -msgstr "" +msgstr "Yanıt isteniyor mu?" #. module: base_calendar #: field:calendar.event,base_calendar_url:0 #: field:calendar.todo,base_calendar_url:0 msgid "Caldav URL" -msgstr "" +msgstr "Caldav URL si" #. module: base_calendar #: view:base.calendar.set.exrule:0 msgid "Select range to Exclude" -msgstr "" +msgstr "Hariç tutulacak alanı seç" #. module: base_calendar #: field:calendar.event,recurrent_uid:0 #: field:calendar.todo,recurrent_uid:0 msgid "Recurrent ID" -msgstr "" +msgstr "Tekrarlayan ID" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "July" -msgstr "" +msgstr "Temmuz" #. module: base_calendar #: view:calendar.attendee:0 #: selection:calendar.attendee,state:0 msgid "Accepted" -msgstr "" +msgstr "Kabul edildi" #. module: base_calendar #: field:base.calendar.set.exrule,th:0 #: field:calendar.event,th:0 #: field:calendar.todo,th:0 msgid "Thu" -msgstr "" +msgstr "Per" #. module: base_calendar #: field:calendar.attendee,child_ids:0 msgid "Delegrated To" -msgstr "" +msgstr "Şuna Yetkilendirildi" #. module: base_calendar #: view:calendar.attendee:0 msgid "Required Reply" -msgstr "" +msgstr "Yanıt İsteniyor" #. module: base_calendar #: selection:calendar.event,end_type:0 #: selection:calendar.todo,end_type:0 msgid "Forever" -msgstr "" +msgstr "Sonsuz" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "Participation required" -msgstr "" +msgstr "Katılım gerekli" #. module: base_calendar #: view:base.calendar.set.exrule:0 msgid "_Cancel" -msgstr "" +msgstr "_Vazgeç" #. module: base_calendar #: field:calendar.event,create_date:0 #: field:calendar.todo,create_date:0 msgid "Created" -msgstr "" +msgstr "Oluşturuldu" #. module: base_calendar #: selection:calendar.event,class:0 #: selection:calendar.todo,class:0 msgid "Private" -msgstr "" +msgstr "Özel" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,rrule_type:0 #: selection:calendar.todo,rrule_type:0 msgid "Daily" -msgstr "" +msgstr "Günlük" #. module: base_calendar #: code:addons/base_calendar/base_calendar.py:385 #, python-format msgid "Can not Duplicate" -msgstr "" +msgstr "Çoğaltılamaz" #. module: base_calendar #: field:calendar.event,class:0 #: field:calendar.todo,class:0 msgid "Mark as" -msgstr "" +msgstr "olarak İşaretle" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,partner_address_id:0 msgid "Contact" -msgstr "" +msgstr "İlgili" #. module: base_calendar #: help:calendar.event,rrule_type:0 #: help:calendar.todo,rrule_type:0 msgid "Let the event automatically repeat at that interval" -msgstr "" +msgstr "Belirli aralıklarla olayın otomatik olarak tekrarlamasına izin ver" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Delegate" -msgstr "" +msgstr "Yetkili" #. module: base_calendar #: field:base_calendar.invite.attendee,partner_id:0 #: view:calendar.attendee:0 #: field:calendar.attendee,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Paydaş" #. module: base_calendar #: view:base_calendar.invite.attendee:0 #: selection:base_calendar.invite.attendee,type:0 msgid "Partner Contacts" -msgstr "" +msgstr "Paydaş İlgilileri" #. module: base_calendar #: view:base.calendar.set.exrule:0 msgid "_Ok" -msgstr "" +msgstr "_Tamam" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "First" -msgstr "" +msgstr "İlk" #. module: base_calendar #: view:calendar.event:0 msgid "Privacy" -msgstr "" +msgstr "Gizlilik" #. module: base_calendar #: field:calendar.event,vtimezone:0 #: field:calendar.todo,vtimezone:0 msgid "Timezone" -msgstr "" +msgstr "Saat dilimi" #. module: base_calendar #: view:calendar.event:0 msgid "Subject" -msgstr "" +msgstr "Konu" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "September" -msgstr "" +msgstr "Eylül" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "December" -msgstr "" +msgstr "Aralık" #. module: base_calendar #: help:base_calendar.invite.attendee,send_mail:0 msgid "Check this if you want to send an Email to Invited Person" -msgstr "" +msgstr "Davet edile kişiye Eposta göndermek isterseniz bunu işaretleyin" #. module: base_calendar #: view:calendar.event:0 msgid "Availability" -msgstr "" +msgstr "Elverişlilik" #. module: base_calendar #: view:calendar.event.edit.all:0 msgid "_Save" -msgstr "" +msgstr "_Sakla" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Individual" -msgstr "" +msgstr "Bireysel" #. module: base_calendar #: help:calendar.event,count:0 #: help:calendar.todo,count:0 msgid "Repeat x times" -msgstr "" +msgstr "x Kere tekrarla" #. module: base_calendar #: field:calendar.alarm,user_id:0 msgid "Owner" -msgstr "" +msgstr "Sahibi" #. module: base_calendar #: view:calendar.attendee:0 msgid "Delegation Info" -msgstr "" +msgstr "Temsilci Bilgisi" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event.edit.all,date:0 msgid "Start Date" -msgstr "" +msgstr "Başlangıç Tarihi" #. module: base_calendar #: field:calendar.attendee,cn:0 msgid "Common name" -msgstr "" +msgstr "Genel ad" #. module: base_calendar #: view:calendar.attendee:0 #: selection:calendar.attendee,state:0 msgid "Declined" -msgstr "" +msgstr "Reddedildi" #. module: base_calendar #: view:calendar.attendee:0 msgid "My Role" -msgstr "" +msgstr "Rolüm" #. module: base_calendar #: view:calendar.event:0 msgid "My Events" -msgstr "" +msgstr "Etkinliklerim" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Decline" -msgstr "" +msgstr "Reddet" #. module: base_calendar #: selection:calendar.event,freq:0 #: selection:calendar.todo,freq:0 msgid "Weeks" -msgstr "" +msgstr "Haftalar" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Group" -msgstr "" +msgstr "Grup" #. module: base_calendar #: field:calendar.event,edit_all:0 #: field:calendar.todo,edit_all:0 msgid "Edit All" -msgstr "" +msgstr "Hepsini Düzenle" #. module: base_calendar #: field:base_calendar.invite.attendee,contact_ids:0 msgid "Contacts" -msgstr "" +msgstr "İlgililer" #. module: base_calendar #: model:ir.model,name:base_calendar.model_res_alarm msgid "Basic Alarm Information" -msgstr "" +msgstr "Temel Alarm Bilgisi" #. module: base_calendar #: field:base.calendar.set.exrule,fr:0 #: field:calendar.event,fr:0 #: field:calendar.todo,fr:0 msgid "Fri" -msgstr "" +msgstr "Cum" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -827,81 +837,80 @@ msgstr "" #: selection:calendar.todo,freq:0 #: selection:res.alarm,trigger_interval:0 msgid "Hours" -msgstr "" +msgstr "Saatler" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:1092 +#: code:addons/base_calendar/base_calendar.py:1090 #, python-format msgid "Count can not be Negative" -msgstr "" +msgstr "Olumsuz olamayacakları say" #. module: base_calendar #: field:calendar.attendee,member:0 msgid "Member" -msgstr "" +msgstr "Üye" #. module: base_calendar #: help:calendar.event,location:0 #: help:calendar.todo,location:0 msgid "Location of Event" -msgstr "" +msgstr "Olay Konumu" #. module: base_calendar #: field:calendar.event,rrule:0 #: field:calendar.todo,rrule:0 msgid "Recurrent Rule" -msgstr "" +msgstr "Yinelenen Kural" #. module: base_calendar #: selection:calendar.alarm,state:0 msgid "Draft" -msgstr "" +msgstr "Taslak" #. module: base_calendar #: field:calendar.alarm,attach:0 msgid "Attachment" -msgstr "" +msgstr "Ek" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation From" -msgstr "" +msgstr "Davet Eden" #. module: base_calendar #: view:calendar.event:0 msgid "End of recurrency" -msgstr "" +msgstr "Yineleme sonu" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event.edit.all,alarm_id:0 msgid "Reminder" -msgstr "" +msgstr "Anımsatıcı" #. module: base_calendar #: view:base.calendar.set.exrule:0 -#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule msgid "Set Exrule" -msgstr "" +msgstr "İstisna Kuralını Ayarla" #. module: base_calendar #: view:calendar.event:0 #: model:ir.actions.act_window,name:base_calendar.action_view_event #: model:ir.ui.menu,name:base_calendar.menu_events msgid "Events" -msgstr "" +msgstr "Olaylar" #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee msgid "Invite Attendees" -msgstr "" +msgstr "Katılımcıları Davet" #. module: base_calendar #: help:calendar.attendee,email:0 msgid "Email of Invited Person" -msgstr "" +msgstr "Davetli Kişinin Epostası" #. module: base_calendar #: field:calendar.alarm,repeat:0 @@ -909,169 +918,169 @@ msgstr "" #: field:calendar.todo,count:0 #: field:res.alarm,repeat:0 msgid "Repeat" -msgstr "" +msgstr "Yinele" #. module: base_calendar #: help:calendar.attendee,dir:0 msgid "" "Reference to the URIthat points to the directory information corresponding " "to the attendee." -msgstr "" +msgstr "Katılımcıyla ilgili dizin bilgisine yönlendiren URL ile ilişkilidir." #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "August" -msgstr "" +msgstr "Ağustos" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Monday" -msgstr "" +msgstr "Pazartesi" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Third" -msgstr "" +msgstr "Üçüncü" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "June" -msgstr "" +msgstr "Haziran" #. module: base_calendar #: field:calendar.alarm,alarm_id:0 msgid "Basic Alarm" -msgstr "" +msgstr "Temel Alarm" #. module: base_calendar #: view:base.calendar.set.exrule:0 #: view:calendar.event:0 msgid "The" -msgstr "" +msgstr "Bu" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,delegated_from:0 msgid "Delegated From" -msgstr "" +msgstr "Temsil Edilen" #. module: base_calendar #: field:calendar.attendee,user_id:0 msgid "User" -msgstr "" +msgstr "Kullanıcı" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event,date:0 msgid "Date" -msgstr "" +msgstr "Tarih" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "November" -msgstr "" +msgstr "Kasım" #. module: base_calendar #: help:calendar.attendee,member:0 msgid "Indicate the groups that the attendee belongs to" -msgstr "" +msgstr "Katılanın bağlı olduğu grubu belirt" #. module: base_calendar #: view:base_calendar.invite.attendee:0 msgid "Data" -msgstr "" +msgstr "Veri" #. module: base_calendar #: field:base.calendar.set.exrule,mo:0 #: field:calendar.event,mo:0 #: field:calendar.todo,mo:0 msgid "Mon" -msgstr "" +msgstr "Pzt" #. module: base_calendar #: field:base.calendar.set.exrule,count:0 msgid "Count" -msgstr "" +msgstr "Say" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,freq:0 #: selection:calendar.todo,freq:0 msgid "No Repeat" -msgstr "" +msgstr "Yineleme Yok" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "October" -msgstr "" +msgstr "Ekim" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Uncertain" -msgstr "" +msgstr "Belirsiz" #. module: base_calendar #: field:calendar.attendee,language:0 msgid "Language" -msgstr "" +msgstr "Dil" #. module: base_calendar #: field:calendar.alarm,trigger_occurs:0 #: field:res.alarm,trigger_occurs:0 msgid "Triggers" -msgstr "" +msgstr "Tetikleyiciler" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "January" -msgstr "" +msgstr "Ocak" #. module: base_calendar #: field:calendar.alarm,trigger_related:0 #: field:res.alarm,trigger_related:0 msgid "Related to" -msgstr "" +msgstr "Bağlı olduğu" #. module: base_calendar #: field:base.calendar.set.exrule,interval:0 #: field:calendar.alarm,trigger_interval:0 #: field:res.alarm,trigger_interval:0 msgid "Interval" -msgstr "" +msgstr "Aralık" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Wednesday" -msgstr "" +msgstr "Çarşamba" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:1090 +#: code:addons/base_calendar/base_calendar.py:1088 #, python-format msgid "Interval can not be Negative" -msgstr "" +msgstr "Aralık Eksi olamaz" #. module: base_calendar #: field:calendar.alarm,name:0 #: view:calendar.event:0 msgid "Summary" -msgstr "" +msgstr "Özet" #. module: base_calendar #: field:calendar.alarm,active:0 @@ -1079,22 +1088,22 @@ msgstr "" #: field:calendar.todo,active:0 #: field:res.alarm,active:0 msgid "Active" -msgstr "" +msgstr "Etkin" #. module: base_calendar #: view:calendar.event:0 msgid "Choose day in the month where repeat the meeting" -msgstr "" +msgstr "Ay içinde görüşmenin tekrarlanacağı günü seç" #. module: base_calendar #: field:calendar.alarm,action:0 msgid "Action" -msgstr "" +msgstr "Eylem" #. module: base_calendar #: help:base_calendar.invite.attendee,type:0 msgid "Select whom you want to Invite" -msgstr "" +msgstr "Davet edeceğinizi kimseyi seçin" #. module: base_calendar #: help:calendar.alarm,duration:0 @@ -1103,50 +1112,52 @@ msgid "" "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the " "other" msgstr "" +"'Süre' ve 'Yineleme' nin her ikisi de seçme bağlıdır, ama biri seçlirse " +"diğeri de seçilmelidir" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_event_edit_all msgid "Calendar Edit all event" -msgstr "" +msgstr "Bütün etkinlikleri Takvimini Düzenle" #. module: base_calendar #: help:calendar.attendee,role:0 msgid "Participation role for the calendar user" -msgstr "" +msgstr "Takvim Kullanıcısının katılım rolü" #. module: base_calendar #: view:calendar.attendee:0 #: field:calendar.attendee,delegated_to:0 msgid "Delegated To" -msgstr "" +msgstr "Temsil edilen" #. module: base_calendar #: help:calendar.alarm,action:0 msgid "Defines the action to be invoked when an alarm is triggered" -msgstr "" +msgstr "Alarm tetiklendiğinde başlatılacak eylemi tanımlar" #. module: base_calendar #: selection:calendar.event,end_type:0 #: selection:calendar.todo,end_type:0 msgid "End date" -msgstr "" +msgstr "Bitiş tarihi" #. module: base_calendar #: view:calendar.event:0 msgid "Search Events" -msgstr "" +msgstr "Etkinlikleri Ara" #. module: base_calendar #: view:calendar.event:0 msgid "Recurrency Option" -msgstr "" +msgstr "Yineleme Seçeneği" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,rrule_type:0 #: selection:calendar.todo,rrule_type:0 msgid "Weekly" -msgstr "" +msgstr "Haftalık" #. module: base_calendar #: help:calendar.alarm,active:0 @@ -1155,17 +1166,19 @@ msgid "" "If the active field is set to true, it will allow you to hide the event " "alarm information without removing it." msgstr "" +"Etkin alan yanlış olarak ayarlıysa, etkinlik alarmını kaldırmadan " +"gizlemenizi sağlar." #. module: base_calendar #: field:calendar.event,recurrent_id:0 #: field:calendar.todo,recurrent_id:0 msgid "Recurrent ID date" -msgstr "" +msgstr "Yinelenen Kimlik tarihi" #. module: base_calendar #: sql_constraint:res.users:0 msgid "You can not have two users with the same login !" -msgstr "" +msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !" #. module: base_calendar #: field:calendar.alarm,state:0 @@ -1175,65 +1188,65 @@ msgstr "" #: field:calendar.event,state:0 #: field:calendar.todo,state:0 msgid "State" -msgstr "" +msgstr "Durum" #. module: base_calendar #: view:res.alarm:0 msgid "Reminder Details" -msgstr "" +msgstr "Anımsatma Ayrıntıları" #. module: base_calendar #: view:calendar.attendee:0 msgid "To Review" -msgstr "" +msgstr "İncelenecek" #. module: base_calendar #: field:base.calendar.set.exrule,freq:0 #: field:calendar.event,freq:0 #: field:calendar.todo,freq:0 msgid "Frequency" -msgstr "" +msgstr "Sıklık" #. module: base_calendar #: selection:calendar.alarm,state:0 msgid "Done" -msgstr "" +msgstr "Bitti" #. module: base_calendar #: help:calendar.event,interval:0 #: help:calendar.todo,interval:0 msgid "Repeat every (Days/Week/Month/Year)" -msgstr "" +msgstr "Her (Gün/Hafta/Ay/Yıl) Tekrarla" #. module: base_calendar #: view:base_calendar.invite.attendee:0 #: field:base_calendar.invite.attendee,user_ids:0 msgid "Users" -msgstr "" +msgstr "Kullanıcılar" #. module: base_calendar #: view:base.calendar.set.exrule:0 msgid "of" -msgstr "" +msgstr "ın" #. module: base_calendar #: view:base_calendar.invite.attendee:0 #: view:calendar.event:0 #: view:calendar.event.edit.all:0 msgid "Cancel" -msgstr "" +msgstr "Vazgeç" #. module: base_calendar #: model:ir.model,name:base_calendar.model_res_users msgid "res.users" -msgstr "" +msgstr "res.users" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Tuesday" -msgstr "" +msgstr "Salı" #. module: base_calendar #: help:calendar.alarm,description:0 @@ -1242,11 +1255,13 @@ msgid "" "calendar component, than that provided by the " "\"SUMMARY\" property" msgstr "" +"Takvim bileşeninin tanımını \"ÖZET\" özelliğinden eldeedilenden daha tam " +"olarak belirtir." #. module: base_calendar #: view:calendar.event:0 msgid "Responsible User" -msgstr "" +msgstr "Sorumlu Kullanıcı" #. module: base_calendar #: selection:calendar.attendee,availability:0 @@ -1254,73 +1269,75 @@ msgstr "" #: selection:calendar.todo,show_as:0 #: selection:res.users,availability:0 msgid "Busy" -msgstr "" +msgstr "Meşgul" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_event msgid "Calendar Event" -msgstr "" +msgstr "Takvim Etkinliği" #. module: base_calendar #: selection:calendar.attendee,state:0 #: selection:calendar.event,state:0 #: selection:calendar.todo,state:0 msgid "Tentative" -msgstr "" +msgstr "Belirsiz" #. module: base_calendar #: field:calendar.event,interval:0 #: field:calendar.todo,interval:0 msgid "Repeat every" -msgstr "" +msgstr "Yineler" #. module: base_calendar #: selection:calendar.event,end_type:0 #: selection:calendar.todo,end_type:0 msgid "Fix amout of times" -msgstr "" +msgstr "Süre Miktarını Düzelt" #. module: base_calendar #: field:calendar.event,recurrency:0 #: field:calendar.todo,recurrency:0 msgid "Recurrent" -msgstr "" +msgstr "Yinelenen" #. module: base_calendar #: field:calendar.event,rrule_type:0 #: field:calendar.todo,rrule_type:0 msgid "Recurrency" -msgstr "" +msgstr "Yineleme" #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form #: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations msgid "Event Invitations" -msgstr "" +msgstr "Etkinlik Davetleri" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Thursday" -msgstr "" +msgstr "Perşembe" #. module: base_calendar #: field:calendar.event,exrule:0 #: field:calendar.todo,exrule:0 msgid "Exception Rule" -msgstr "" +msgstr "Muafşyet Kuralı" #. module: base_calendar #: help:calendar.attendee,language:0 msgid "" "To specify the language for text values in aproperty or property parameter." msgstr "" +"Bir özellikteki ya da özellik parametresine ait metin değerlerinin dilini " +"belirler." #. module: base_calendar #: view:calendar.event:0 msgid "Details" -msgstr "" +msgstr "Ayrıntılar" #. module: base_calendar #: help:calendar.event,exrule:0 @@ -1329,19 +1346,20 @@ msgid "" "Defines a rule or repeating pattern of time to exclude from the recurring " "rule." msgstr "" +"Yineleme kuralı dışında tutulan bir zaman tekrarlama modelini tanımlar." #. module: base_calendar #: field:base.calendar.set.exrule,month_list:0 #: field:calendar.event,month_list:0 #: field:calendar.todo,month_list:0 msgid "Month" -msgstr "" +msgstr "Ay" #. module: base_calendar #: view:base_calendar.invite.attendee:0 #: view:calendar.event:0 msgid "Invite People" -msgstr "" +msgstr "Kişi Davet Et" #. module: base_calendar #: help:calendar.event,rrule:0 @@ -1351,11 +1369,14 @@ msgid "" "e.g.: Every other month on the last Sunday of the month for 10 occurrences: " " FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU" msgstr "" +"Yinelenen olaylar için tekrarlama modeli kuralı tanımlar\n" +"Örneğin: İki ayda bir ayın pazar günü için 10 oluşum: " +"SIKLIK=AYLIK;ARALIK=2;SAYI=10;GÜNLÜK=-1PAZ" #. module: base_calendar #: field:calendar.attendee,dir:0 msgid "URI Reference" -msgstr "" +msgstr "URI Referansı" #. module: base_calendar #: field:calendar.alarm,description:0 @@ -1365,108 +1386,108 @@ msgstr "" #: field:calendar.todo,description:0 #: field:calendar.todo,name:0 msgid "Description" -msgstr "" +msgstr "Açıklama" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "May" -msgstr "" +msgstr "Mayıs" #. module: base_calendar #: field:base_calendar.invite.attendee,type:0 #: view:calendar.attendee:0 msgid "Type" -msgstr "" +msgstr "Tür" #. module: base_calendar #: view:calendar.attendee:0 msgid "Search Invitations" -msgstr "" +msgstr "Davetiye Ara" #. module: base_calendar #: selection:calendar.alarm,trigger_occurs:0 #: selection:res.alarm,trigger_occurs:0 msgid "After" -msgstr "" +msgstr "Sonra" #. module: base_calendar #: selection:calendar.alarm,state:0 msgid "Stop" -msgstr "" +msgstr "Dur" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_values msgid "ir.values" -msgstr "" +msgstr "ir.values" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_model msgid "Objects" -msgstr "" +msgstr "Nesneler" #. module: base_calendar #: view:calendar.attendee:0 #: selection:calendar.attendee,state:0 msgid "Delegated" -msgstr "" +msgstr "Temsil Edildi" #. module: base_calendar #: field:base.calendar.set.exrule,sa:0 #: field:calendar.event,sa:0 #: field:calendar.todo,sa:0 msgid "Sat" -msgstr "" +msgstr "Cts" #. module: base_calendar #: view:calendar.event:0 msgid "Choose day where repeat the meeting" -msgstr "" +msgstr "Görüşmenin tekrarlanacağı günü seç" #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 msgid "Minutely" -msgstr "" +msgstr "Dakikalık" #. module: base_calendar #: help:calendar.attendee,sent_by:0 msgid "Specify the user that is acting on behalf of the calendar user" -msgstr "" +msgstr "Takvim kullanıcısı adına hareket eden kullanıcıyı tanımla" #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event.edit.all,date_deadline:0 msgid "End Date" -msgstr "" +msgstr "Bitiş Tarihi" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "February" -msgstr "" +msgstr "Şubat" #. module: base_calendar #: selection:calendar.event,freq:0 #: selection:calendar.todo,freq:0 msgid "Months" -msgstr "" +msgstr "Aylar" #. module: base_calendar #: selection:calendar.attendee,cutype:0 msgid "Resource" -msgstr "" +msgstr "Kaynak" #. module: base_calendar #: field:res.alarm,name:0 msgid "Name" -msgstr "" +msgstr "Ad" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_alarm msgid "Event alarm information" -msgstr "" +msgstr "Etkinlik alarm bilgisi" #. module: base_calendar #: help:calendar.alarm,name:0 @@ -1474,6 +1495,8 @@ msgid "" "Contains the text to be used as the message subject for " "email or contains the text to be used for display" msgstr "" +"Eposta konusu olarak kullanılacak ya da görüntülenecek metin olarak " +"kullanılacak metni içerir." #. module: base_calendar #: field:calendar.event,alarm_id:0 @@ -1481,144 +1504,144 @@ msgstr "" #: field:calendar.todo,alarm_id:0 #: field:calendar.todo,base_calendar_alarm_id:0 msgid "Alarm" -msgstr "" +msgstr "Alarm" #. module: base_calendar #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90 #, python-format msgid "Please Apply Recurrency before applying Exception Rule." -msgstr "" +msgstr "İstisna Kuralını uygulamadan önce lütfen Yineleme Uygulayın." #. module: base_calendar #: field:calendar.attendee,sent_by_uid:0 msgid "Sent By User" -msgstr "" +msgstr "Şu Kullanıcı tarafından gönderildi" #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 #: selection:calendar.todo,month_list:0 msgid "April" -msgstr "" +msgstr "Nisan" #. module: base_calendar #: view:calendar.event:0 msgid "Recurrency period" -msgstr "" +msgstr "Yineleme Dönemi" #. module: base_calendar #: field:base.calendar.set.exrule,week_list:0 #: field:calendar.event,week_list:0 #: field:calendar.todo,week_list:0 msgid "Weekday" -msgstr "" +msgstr "Hafta İçi" #. module: base_calendar #: field:base.calendar.set.exrule,byday:0 #: field:calendar.event,byday:0 #: field:calendar.todo,byday:0 msgid "By day" -msgstr "" +msgstr "Gündüz" #. module: base_calendar #: field:calendar.alarm,model_id:0 msgid "Model" -msgstr "" +msgstr "Model" #. module: base_calendar #: selection:calendar.alarm,action:0 msgid "Audio" -msgstr "" +msgstr "Ses" #. module: base_calendar #: field:calendar.event,id:0 #: field:calendar.todo,id:0 msgid "ID" -msgstr "" +msgstr "Kimlik" #. module: base_calendar #: selection:calendar.attendee,role:0 msgid "For information Purpose" -msgstr "" +msgstr "Bilgi Amaçlı" #. module: base_calendar #: view:base_calendar.invite.attendee:0 msgid "Invite" -msgstr "" +msgstr "Davet et" #. module: base_calendar #: model:ir.model,name:base_calendar.model_calendar_attendee msgid "Attendee information" -msgstr "" +msgstr "Katılımcı Bilgisi" #. module: base_calendar #: field:calendar.alarm,res_id:0 msgid "Resource ID" -msgstr "" +msgstr "Kaynak Kimliği" #. module: base_calendar #: selection:calendar.attendee,state:0 msgid "Needs Action" -msgstr "" +msgstr "Eylem Gerekir" #. module: base_calendar #: field:calendar.attendee,sent_by:0 msgid "Sent By" -msgstr "" +msgstr "Gönderen" #. module: base_calendar #: field:calendar.event,sequence:0 #: field:calendar.todo,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Diziliş" #. module: base_calendar #: help:calendar.event,alarm_id:0 #: help:calendar.todo,alarm_id:0 msgid "Set an alarm at this time, before the event occurs" -msgstr "" +msgstr "Bu sefer etkinlik başlamadan önce alarm ayarla" #. module: base_calendar #: selection:base_calendar.invite.attendee,type:0 msgid "Internal User" -msgstr "" +msgstr "İç Kullanıcı" #. module: base_calendar #: view:calendar.attendee:0 #: view:calendar.event:0 msgid "Accept" -msgstr "" +msgstr "Kabul et" #. module: base_calendar #: selection:base.calendar.set.exrule,week_list:0 #: selection:calendar.event,week_list:0 #: selection:calendar.todo,week_list:0 msgid "Saturday" -msgstr "" +msgstr "Cumartesi" #. module: base_calendar #: view:calendar.attendee:0 msgid "Invitation To" -msgstr "" +msgstr "Davetiye Gönder" #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Second" -msgstr "" +msgstr "İkinci" #. module: base_calendar #: field:calendar.attendee,availability:0 #: field:res.users,availability:0 msgid "Free/Busy" -msgstr "" +msgstr "Uygun/Meşgul" #. module: base_calendar #: field:calendar.event,end_type:0 #: field:calendar.todo,end_type:0 msgid "Way to end reccurency" -msgstr "" +msgstr "Yineleme sonlandırma yolu" #. module: base_calendar #: field:calendar.alarm,duration:0 @@ -1629,17 +1652,17 @@ msgstr "" #: field:res.alarm,duration:0 #: field:res.alarm,trigger_duration:0 msgid "Duration" -msgstr "" +msgstr "Süre" #. module: base_calendar #: selection:base_calendar.invite.attendee,type:0 msgid "External Email" -msgstr "" +msgstr "Dış Eposta" #. module: base_calendar #: field:calendar.alarm,trigger_date:0 msgid "Trigger Date" -msgstr "" +msgstr "Tetikleme Tarihi" #. module: base_calendar #: help:calendar.alarm,attach:0 @@ -1651,10 +1674,19 @@ msgid "" " * Points to a procedure resource, which is invoked when " " the alarm is triggered for procedure." msgstr "" +"* Alarmın ses çalması için tetiklendiği durumuna benzeterek, Bir ses " +"kaynağını işaret eder.\n" +" * Bir epostaya mesal eki olarak gönderilmek istenen " +"dosya,\n" +" * Alarm işlem için tetiklendiğinde işlem kaynağını " +"işaret eder." #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 #: selection:calendar.todo,byday:0 msgid "Fifth" -msgstr "" +msgstr "Beşinci" + +#~ msgid "Set Exclude range" +#~ msgstr "Hariç tutulacak alanı ayarla" diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index fb152da929d..c074718b6fe 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -26,18 +26,35 @@ "website" : "http://www.openerp.com", "category" : "Tools", "description": """ -This module replaces the cleartext password in the database with a password hash. -================================================================================= +Replaces cleartext passwords in the database with a secure hash +=============================================================== +For your existing user base, the removal of the cleartext +passwords occurs the first time a user logs into the database, +after installing base_crypt. -It prevents anyone from reading the original password. -For your existing user base, the removal of the cleartext passwords occurs the first time -a user logs into the database, after installing base_crypt. -After installing this module it won't be possible to recover a forgotten password for your -users, the only solution is for an admin to set a new password. +All passwords will be replaced by a secure, salted, cryptographic +hash, preventing anyone from reading the original password in +the database. + +After installing this module it won't be possible to recover a +forgotten password for your users, the only solution is for an +admin to set a new password. + +Security Warning +++++++++++++++++ +Installing this module does not mean you can ignore other security measures, +as the password is still transmitted unencrypted on the network, unless you +are using a secure protocol such as XML-RPCS. +It also does not protect the rest of the content of the database, which may +contain critical data. Appropriate security measures need to be implemented +by the system administrator in all areas, such as: protection of database +backups, system files, remote shell access, physical server access, etc. + +Interation with LDAP authentication ++++++++++++++++++++++++++++++++++++ +This module is currently not compatible with the ``user_ldap`` module and +will disable LDAP authentication completely if installed at the same time. -Note: installing this module does not mean you can ignore basic security measures, -as the password is still transmitted unencrypted on the network (by the client), -unless you are using a secure protocol such as XML-RPCS. """, "depends" : ["base"], "data" : [], diff --git a/addons/base_crypt/i18n/es_CL.po b/addons/base_crypt/i18n/es_CL.po new file mode 100644 index 00000000000..2892c5fe0ba --- /dev/null +++ b/addons/base_crypt/i18n/es_CL.po @@ -0,0 +1,72 @@ +# Spanish (Chile) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-06 18:09+0000\n" +"Last-Translator: doingit.cl \n" +"Language-Team: Spanish (Chile) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-07 04:35+0000\n" +"X-Generator: Launchpad (build 12959)\n" + +#. module: base_crypt +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "" + +#. module: base_crypt +#: model:ir.model,name:base_crypt.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: base_crypt +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" +"La compañía seleccionada no está autorizada como compañía para este usuario" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Please specify the password !" +msgstr "" + +#. module: base_crypt +#: model:ir.module.module,shortdesc:base_crypt.module_meta_information +msgid "Base - Password Encryption" +msgstr "" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Error" +msgstr "Error!" + +#. module: base_crypt +#: model:ir.module.module,description:base_crypt.module_meta_information +msgid "" +"This module replaces the cleartext password in the database with a password " +"hash,\n" +"preventing anyone from reading the original password.\n" +"For your existing user base, the removal of the cleartext passwords occurs " +"the first time\n" +"a user logs into the database, after installing base_crypt.\n" +"After installing this module it won't be possible to recover a forgotten " +"password for your\n" +"users, the only solution is for an admin to set a new password.\n" +"\n" +"Note: installing this module does not mean you can ignore basic security " +"measures,\n" +"as the password is still transmitted unencrypted on the network (by the " +"client),\n" +"unless you are using a secure protocol such as XML-RPCS.\n" +" " +msgstr "" diff --git a/addons/base_crypt/i18n/fi.po b/addons/base_crypt/i18n/fi.po new file mode 100644 index 00000000000..57b350a204f --- /dev/null +++ b/addons/base_crypt/i18n/fi.po @@ -0,0 +1,71 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-08 10:57+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-09 04:35+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: base_crypt +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Kahdella eri käyttäjällä ei voi olla samaa käyttäjätunnusta!" + +#. module: base_crypt +#: model:ir.model,name:base_crypt.model_res_users +msgid "res.users" +msgstr "" + +#. module: base_crypt +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Please specify the password !" +msgstr "Määrittele salasana !" + +#. module: base_crypt +#: model:ir.module.module,shortdesc:base_crypt.module_meta_information +msgid "Base - Password Encryption" +msgstr "Base - Salasanan kryptaus" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Error" +msgstr "Virhe" + +#. module: base_crypt +#: model:ir.module.module,description:base_crypt.module_meta_information +msgid "" +"This module replaces the cleartext password in the database with a password " +"hash,\n" +"preventing anyone from reading the original password.\n" +"For your existing user base, the removal of the cleartext passwords occurs " +"the first time\n" +"a user logs into the database, after installing base_crypt.\n" +"After installing this module it won't be possible to recover a forgotten " +"password for your\n" +"users, the only solution is for an admin to set a new password.\n" +"\n" +"Note: installing this module does not mean you can ignore basic security " +"measures,\n" +"as the password is still transmitted unencrypted on the network (by the " +"client),\n" +"unless you are using a secure protocol such as XML-RPCS.\n" +" " +msgstr "" diff --git a/addons/base_crypt/i18n/nb.po b/addons/base_crypt/i18n/nb.po new file mode 100644 index 00000000000..ce85f3b3625 --- /dev/null +++ b/addons/base_crypt/i18n/nb.po @@ -0,0 +1,72 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-09 11:12+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: base_crypt +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Du kan ikke ha to brukere med samme login !" + +#. module: base_crypt +#: model:ir.model,name:base_crypt.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: base_crypt +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" +"Det valgte firmaet er ikke i listen over tillatte firmaer for denne brukeren" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Please specify the password !" +msgstr "Vennligst angi passordet !" + +#. module: base_crypt +#: model:ir.module.module,shortdesc:base_crypt.module_meta_information +msgid "Base - Password Encryption" +msgstr "Basis - Passord kryptering" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Error" +msgstr "Feil" + +#. module: base_crypt +#: model:ir.module.module,description:base_crypt.module_meta_information +msgid "" +"This module replaces the cleartext password in the database with a password " +"hash,\n" +"preventing anyone from reading the original password.\n" +"For your existing user base, the removal of the cleartext passwords occurs " +"the first time\n" +"a user logs into the database, after installing base_crypt.\n" +"After installing this module it won't be possible to recover a forgotten " +"password for your\n" +"users, the only solution is for an admin to set a new password.\n" +"\n" +"Note: installing this module does not mean you can ignore basic security " +"measures,\n" +"as the password is still transmitted unencrypted on the network (by the " +"client),\n" +"unless you are using a secure protocol such as XML-RPCS.\n" +" " +msgstr "" diff --git a/addons/base_crypt/i18n/pt.po b/addons/base_crypt/i18n/pt.po new file mode 100644 index 00000000000..258d3f44ab0 --- /dev/null +++ b/addons/base_crypt/i18n/pt.po @@ -0,0 +1,71 @@ +# Portuguese translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-06 22:16+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-07 04:35+0000\n" +"X-Generator: Launchpad (build 12959)\n" + +#. module: base_crypt +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Não pode ter dois utilizadores com o mesmo nome de utilizador!" + +#. module: base_crypt +#: model:ir.model,name:base_crypt.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: base_crypt +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "A companhia escolhida não está entre permitidas para este utilizador" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Please specify the password !" +msgstr "Por favor escolha uma password!" + +#. module: base_crypt +#: model:ir.module.module,shortdesc:base_crypt.module_meta_information +msgid "Base - Password Encryption" +msgstr "" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Error" +msgstr "Erro" + +#. module: base_crypt +#: model:ir.module.module,description:base_crypt.module_meta_information +msgid "" +"This module replaces the cleartext password in the database with a password " +"hash,\n" +"preventing anyone from reading the original password.\n" +"For your existing user base, the removal of the cleartext passwords occurs " +"the first time\n" +"a user logs into the database, after installing base_crypt.\n" +"After installing this module it won't be possible to recover a forgotten " +"password for your\n" +"users, the only solution is for an admin to set a new password.\n" +"\n" +"Note: installing this module does not mean you can ignore basic security " +"measures,\n" +"as the password is still transmitted unencrypted on the network (by the " +"client),\n" +"unless you are using a secure protocol such as XML-RPCS.\n" +" " +msgstr "" diff --git a/addons/base_crypt/i18n/vi.po b/addons/base_crypt/i18n/vi.po new file mode 100644 index 00000000000..cd1ed4f93ea --- /dev/null +++ b/addons/base_crypt/i18n/vi.po @@ -0,0 +1,73 @@ +# Vietnamese translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-04 22:52+0000\n" +"Last-Translator: Phong Nguyen-Thanh \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-06 04:37+0000\n" +"X-Generator: Launchpad (build 12959)\n" + +#. module: base_crypt +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Bạn không thể có hai người sử dụng với cùng tên đăng nhập !" + +#. module: base_crypt +#: model:ir.model,name:base_crypt.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: base_crypt +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" +"Công ty được lựa chọn không nằm trong các công ty mà người sử dụng này được " +"phép" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Please specify the password !" +msgstr "Vui lòng xác định mật khẩu !" + +#. module: base_crypt +#: model:ir.module.module,shortdesc:base_crypt.module_meta_information +msgid "Base - Password Encryption" +msgstr "Cơ sở - Mã hóa Mật khẩu" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Error" +msgstr "Lỗi" + +#. module: base_crypt +#: model:ir.module.module,description:base_crypt.module_meta_information +msgid "" +"This module replaces the cleartext password in the database with a password " +"hash,\n" +"preventing anyone from reading the original password.\n" +"For your existing user base, the removal of the cleartext passwords occurs " +"the first time\n" +"a user logs into the database, after installing base_crypt.\n" +"After installing this module it won't be possible to recover a forgotten " +"password for your\n" +"users, the only solution is for an admin to set a new password.\n" +"\n" +"Note: installing this module does not mean you can ignore basic security " +"measures,\n" +"as the password is still transmitted unencrypted on the network (by the " +"client),\n" +"unless you are using a secure protocol such as XML-RPCS.\n" +" " +msgstr "" diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po new file mode 100644 index 00000000000..ee8bd3df6f4 --- /dev/null +++ b/addons/base_crypt/i18n/zh_CN.po @@ -0,0 +1,77 @@ +# Chinese (Simplified) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-22 08:19+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-23 04:56+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: base_crypt +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "你不能同时登录两个用户！" + +#. module: base_crypt +#: model:ir.model,name:base_crypt.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: base_crypt +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "用户无权操作所选择公司数据" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Please specify the password !" +msgstr "请指定密码！" + +#. module: base_crypt +#: model:ir.module.module,shortdesc:base_crypt.module_meta_information +msgid "Base - Password Encryption" +msgstr "Base - Password Encryption" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:132 +#, python-format +msgid "Error" +msgstr "错误" + +#. module: base_crypt +#: model:ir.module.module,description:base_crypt.module_meta_information +msgid "" +"This module replaces the cleartext password in the database with a password " +"hash,\n" +"preventing anyone from reading the original password.\n" +"For your existing user base, the removal of the cleartext passwords occurs " +"the first time\n" +"a user logs into the database, after installing base_crypt.\n" +"After installing this module it won't be possible to recover a forgotten " +"password for your\n" +"users, the only solution is for an admin to set a new password.\n" +"\n" +"Note: installing this module does not mean you can ignore basic security " +"measures,\n" +"as the password is still transmitted unencrypted on the network (by the " +"client),\n" +"unless you are using a secure protocol such as XML-RPCS.\n" +" " +msgstr "" +"这个模块在数据库里用密码散列代替原来的明文密码，防止任何人读取到原密码。\n" +"对于已存在在数据，当安装了base_crypt后，明文密码会在用户第一次登陆数据库的时候清除。\n" +"在安装了这个模块后将不能恢复已遗忘的用户密码，唯一的解决办法是通过管理员输入一个新密码。\n" +"注意：安装这个模块并不意味着你可以忽略基本安全措施，\n" +"除非你用了一个安全协议例如XML-RPCS，否则密码在网络仍然以非加密的形式传输（通过客户端）\n" +" " diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 22bc7f3a089..0208e6cdc37 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -20,53 +20,11 @@ ############################################################################## from xml.dom import minidom -from osv.osv import osv_pool from osv import fields,osv import pooler import string import tools -class recording_objects_proxy(osv_pool): - def execute(self, *args, **argv): - if args[3] == 'create': - _old_args = args[4].copy() - elif args[3] == 'write': - _old_args = args[5].copy() - elif len(args) >= 5 and isinstance(args[4], dict): - _old_args = args[4].copy() - elif len(args) > 5 and args[3] != 'write' and isinstance(args[5], dict): - _old_args = args[5].copy() - else: - _old_args = None - res = super(recording_objects_proxy, self).execute(*args, **argv) - pool = pooler.get_pool(args[0]) - mod = pool.get('ir.module.record') - - if mod and mod.recording: - if args[3] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink'): - if _old_args is not None: - if args[3] != 'write' and args[3] != 'create' and len(args) > 5 and isinstance(args[5], dict): - args=list(args) - args[5]=_old_args - args=tuple(args) - mod.recording_data.append(('osv_memory_action', args, argv ,None)) - else: - if args[3] == 'create': - args[4].update(_old_args) - elif args[3] == 'write': - args[5].update(_old_args) - mod.recording_data.append(('query', args, argv,res)) - return res - - def exec_workflow(self, *args, **argv): - res = super(recording_objects_proxy, self).exec_workflow(*args, **argv) - pool = pooler.get_pool(args[0]) - mod = pool.get('ir.module.record') - if mod and mod.recording: - mod.recording_data.append(('workflow', args, argv)) - return res - -recording_objects_proxy() class xElement(minidom.Element): """dom.Element with compact print diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip index 47ca560e47d..85c9150cb73 100644 Binary files a/addons/base_report_designer/plugin/openerp_report_designer.zip and b/addons/base_report_designer/plugin/openerp_report_designer.zip differ diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu b/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu index 121c49af167..f9c1280202d 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/package/Addons.xcu @@ -19,7 +19,7 @@ - service:org.openoffice.openerp.report.serverparam?execute + service:org.openoffice.openerp.report.change?execute @@ -283,7 +283,7 @@ - service:org.openoffice.openerp.report.serverparam?execute + service:org.openoffice.openerp.report.change?execute @@ -593,7 +593,7 @@ - service:org.openoffice.openerp.report.serverparam?execute + service:org.openoffice.openerp.report.change?execute diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py index d4359a466ca..0b68ab10b01 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py @@ -44,68 +44,96 @@ # # ############################################################################## - +import uno +import string +import unohelper +import xmlrpclib +from com.sun.star.task import XJobExecutor if __name__<>"package": from lib.gui import * + from lib.error import ErrorDialog from lib.functions import * + from lib.logreport import * from lib.rpc import * + from ServerParameter import * + database="test" -class Change: - def __init__(self, aVal= None, sURL=""): +class Change( unohelper.Base, XJobExecutor ): + def __init__(self,ctx): + self.ctx = ctx + self.module = "openerp_report" + self.version = "0.1" + desktop=getDesktop() + log_detail(self) + self.logobj=Logger() + doc = desktop.getCurrentComponent() + docinfo=doc.getDocumentInfo() + self.protocol = { + 'XML-RPC': 'http://', + 'XML-RPC secure': 'https://', + 'NET-RPC': 'socket://', + } + host=port=protocol='' + if docinfo.getUserFieldValue(0): + m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', docinfo.getUserFieldValue(0) or '') + host = m.group(2) + port = m.group(3) + protocol = m.group(1) + if protocol: + for (key, value) in self.protocol.iteritems(): + if value==protocol: + protocol=key + break + else: + protocol='XML-RPC' self.win=DBModalDialog(60, 50, 120, 90, "Connect to Open ERP Server") self.win.addFixedText("lblVariable", 38, 12, 25, 15, "Server ") - - self.win.addEdit("txtHost",-2,9,60,15,sURL[sURL.find("/")+2:sURL.rfind(":")]) + self.win.addEdit("txtHost",-2,9,60,15, host or 'localhost') self.win.addFixedText("lblReportName",45 , 31, 15, 15, "Port ") - self.win.addEdit("txtPort",-2,28,60,15,sURL[sURL.rfind(":")+1:]) + self.win.addEdit("txtPort",-2,28,60,15, port or "8069") self.win.addFixedText("lblLoginName", 2, 51, 60, 15, "Protocol Connection") self.win.addComboListBox("lstProtocol", -2, 48, 60, 15, True) self.lstProtocol = self.win.getControl( "lstProtocol" ) -# self.lstProtocol.addItem( "XML-RPC", 0) - #self.lstProtocol.addItem( "XML-RPC secure", 1) - #self.lstProtocol.addItem( "NET-RPC (faster)", 2) - - self.win.addButton( 'btnOK', -2, -5, 30, 15, 'Ok', actionListenerProc = self.btnOk_clicked ) + self.win.addButton( 'btnNext', -2, -5, 30, 15, 'Next', actionListenerProc = self.btnNext_clicked ) self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked ) - self.aVal=aVal - self.protocol = { - 'XML-RPC': 'http://', - 'XML-RPC secure': 'https://', - 'NET-RPC': 'socket://', - } + for i in self.protocol.keys(): self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() ) + self.win.doModalDialog( "lstProtocol", protocol) - sValue=self.protocol.keys()[0] - if sURL<>"": - sValue=self.protocol.keys()[self.protocol.values().index(sURL[:sURL.find("/")+2])] - - self.win.doModalDialog( "lstProtocol", sValue) - - def btnOk_clicked(self,oActionEvent): + def btnNext_clicked(self,oActionEvent): global url - url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort") - self.sock=RPCSession(url) - desktop=getDesktop() - doc = desktop.getCurrentComponent() - docinfo=doc.getDocumentInfo() - docinfo.setUserFieldValue(0,url) - res=self.sock.listdb() - if res == -1: - self.aVal.append(url) - elif res == 0: - self.aVal.append("No Database found !!!") - else: - self.aVal.append(url) - self.aVal.append(res) + aVal='' + #aVal= Fetature used + try: + url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort") + self.sock=RPCSession(url) + desktop=getDesktop() + doc = desktop.getCurrentComponent() + docinfo=doc.getDocumentInfo() + docinfo.setUserFieldValue(0,url) + res=self.sock.listdb() + self.win.endExecute() + ServerParameter(aVal,url) + except : + import traceback,sys + info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback)) + self.logobj.log_write('ServerParameter', LOG_ERROR, info) + ErrorDialog("Connection to server fail. please check your Server Parameter", "", "Error") + self.win.endExecute() + + def btnCancel_clicked(self,oActionEvent): self.win.endExecute() + - def btnCancel_clicked( self, oActionEvent ): - self.win.endExecute() +if __name__<>"package" and __name__=="__main__": + Change(None) +elif __name__=="package": + g_ImplementationHelper.addImplementation( Change, "org.openoffice.openerp.report.change", ("com.sun.star.task.Job",),) diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py index dbd597e1f2d..012c6f896a2 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py @@ -51,5 +51,5 @@ if __name__<>"package": class LoginTest: def __init__(self): if not loginstatus: - ServerParameter(None) + Change(None) diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py index 3cf759e7ada..245cd1dc7ce 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py @@ -59,8 +59,7 @@ if __name__<>"package": database="test" class ServerParameter( unohelper.Base, XJobExecutor ): - def __init__(self,ctx): - self.ctx = ctx + def __init__(self, aVal= None, sURL=""): self.module = "openerp_report" self.version = "0.1" desktop=getDesktop() @@ -69,19 +68,12 @@ class ServerParameter( unohelper.Base, XJobExecutor ): doc = desktop.getCurrentComponent() docinfo=doc.getDocumentInfo() self.win=DBModalDialog(60, 50, 160, 108, "Server Connection Parameter") - self.win.addFixedText("lblVariable", 2, 12, 35, 15, "Server URL") if docinfo.getUserFieldValue(0)=="": - docinfo.setUserFieldValue(0,"http://localhost:8069") - self.win.addEdit("txtHost",-34,9,91,15,docinfo.getUserFieldValue(0)) - self.win.addButton('btnChange',-2 ,9,30,15,'Change', actionListenerProc = self.btnChange_clicked ) - + docinfo.setUserFieldValue(0,"http://localhost:8069") + self.win.addFixedText("txtHost",-20,12,105,15,sURL) self.win.addFixedText("lblDatabaseName", 6, 31, 31, 15, "Database") - #self.win.addFixedText("lblMsg", -2,28,123,15) -# self.win.addComboListBox("lstDatabase", -2,28,123,15, True) -# self.lstDatabase = self.win.getControl( "lstDatabase" ) - #self.win.selectListBoxItem( "lstDatabase", docinfo.getUserFieldValue(2), True ) - #self.win.setEnabled("lblMsg",False) + self.win.addFixedText("lblLoginName", 17, 51, 20, 15, "Login") self.win.addEdit("txtLoginName",-2,48,123,15,docinfo.getUserFieldValue(1)) @@ -92,8 +84,9 @@ class ServerParameter( unohelper.Base, XJobExecutor ): self.win.addButton('btnOK',-2 ,-5, 60,15,'Connect' ,actionListenerProc = self.btnOk_clicked ) - - self.win.addButton('btnCancel',-2 - 60 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked ) + self.win.addButton('btnPrevious',15 -80 ,-5,50,15,'Previous',actionListenerProc = self.btnPrevious_clicked) + self.win.addButton('btnCancel',-2 - 110 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked ) + sValue="" if docinfo.getUserFieldValue(0)<>"": global url @@ -125,7 +118,6 @@ class ServerParameter( unohelper.Base, XJobExecutor ): def btnOk_clicked(self,oActionEvent): - sLogin=self.win.getEditText("txtLoginName") sPassword=self.win.getEditText("txtPassword") global url @@ -136,20 +128,14 @@ class ServerParameter( unohelper.Base, XJobExecutor ): sDatabase=self.win.getListBoxSelectedItem("lstDatabase") self.sock=RPCSession(url) UID = self.sock.login(sDatabase,sLogin,sPassword) - if not UID : + if not UID or UID==-1 : ErrorDialog("Connection Refuse...","Please enter valid Login/Password") - self.win.endExecute() - try: - ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')]) - except : - import traceback,sys - info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback)) - self.logobj.log_write('ServerParameter', LOG_ERROR, info) - + # self.win.endExecute() + ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')]) if not len(ids_module): ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error") self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in database %s' % (sDatabase)) - self.win.endExecute() + #self.win.endExecute() else: desktop=getDesktop() doc = desktop.getCurrentComponent() @@ -171,27 +157,15 @@ class ServerParameter( unohelper.Base, XJobExecutor ): self.logobj.log_write('successful login',LOG_INFO, ':successful login from %s using database %s' % (sLogin, sDatabase)) self.win.endExecute() + def btnCancel_clicked( self, oActionEvent ): self.win.endExecute() - def btnChange_clicked(self,oActionEvent): - aVal=[] - url= self.win.getEditText("txtHost") - Change(aVal,url) - if aVal[1]== -1: - self.win.getEditText("lstDatabase") - self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase")) - self.win.setEditText("txtHost",aVal[0]) - for i in range(len(aVal[1])): - self.lstDatabase.addItem(aVal[1][i],i) - elif aVal[1]==0: - ErrorDialog(aVal[0],"") - else: - self.win.setEditText("txtHost",aVal[0]) - self.win.removeListBoxItems("lstDatabase", 0, self.win.getListBoxItemCount("lstDatabase")) - for i in range(len(aVal[1])): - self.lstDatabase.addItem(aVal[1][i],i) - + def btnPrevious_clicked(self,oActionEvent): + self.win.endExecute() + Change(None) + self.win.endExecute() + if __name__<>"package" and __name__=="__main__": ServerParameter(None) diff --git a/addons/base_synchro/i18n/fi.po b/addons/base_synchro/i18n/fi.po new file mode 100644 index 00000000000..3d6f0a35015 --- /dev/null +++ b/addons/base_synchro/i18n/fi.po @@ -0,0 +1,289 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-09 10:01+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-10 04:37+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: base_synchro +#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro +msgid "Base Synchronization" +msgstr "Pohjatietojen synkronointi" + +#. module: base_synchro +#: field:base.synchro.server,server_db:0 +msgid "Server Database" +msgstr "Palvelintietokanta" + +#. module: base_synchro +#: view:base.synchro.server:0 +#: model:ir.model,name:base_synchro.model_base_synchro_server +msgid "Synchronized server" +msgstr "Synkronoitu palvelin" + +#. module: base_synchro +#: field:base.synchro.obj.avoid,name:0 +msgid "Field Name" +msgstr "Kentän nimi" + +#. module: base_synchro +#: field:base.synchro.obj,synchronize_date:0 +msgid "Latest Synchronization" +msgstr "Viimeisin synkronointi" + +#. module: base_synchro +#: field:base.synchro,user_id:0 +msgid "Send Result To" +msgstr "Lähetä tulos" + +#. module: base_synchro +#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid +msgid "Fields to not synchronize" +msgstr "Kentät, joita ei synkronoida" + +#. module: base_synchro +#: view:base.synchro:0 +msgid "_Close" +msgstr "" + +#. module: base_synchro +#: view:base.synchro:0 +msgid "Transfer Data To Server" +msgstr "Siirrä tiedot palvelimelle" + +#. module: base_synchro +#: model:ir.model,name:base_synchro.model_base_synchro_obj +msgid "Register Class" +msgstr "Rekisteröi luokka" + +#. module: base_synchro +#: view:base.synchro.obj:0 +#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree +#: model:ir.ui.menu,name:base_synchro.transfer_menu_id +msgid "Synchronized objects" +msgstr "Synkronoidut objektit" + +#. module: base_synchro +#: field:base.synchro.server,obj_ids:0 +msgid "Models" +msgstr "Mallit" + +#. module: base_synchro +#: field:base.synchro.obj.avoid,obj_id:0 +#: view:base.synchro.obj.line:0 +#: field:base.synchro.obj.line,obj_id:0 +msgid "Object" +msgstr "Objekti" + +#. module: base_synchro +#: field:base.synchro.server,login:0 +msgid "User Name" +msgstr "Käyttäjänimi" + +#. module: base_synchro +#: view:base.synchro.obj:0 +#: view:base.synchro.obj.line:0 +msgid "Group By" +msgstr "Ryhmittelyn peruste" + +#. module: base_synchro +#: selection:base.synchro.obj,action:0 +msgid "Upload" +msgstr "Lähetä palvelimelle" + +#. module: base_synchro +#: view:base.synchro.obj:0 +msgid "Latest synchronization" +msgstr "Viimeisin synkronointi" + +#. module: base_synchro +#: model:ir.module.module,description:base_synchro.module_meta_information +msgid "Synchronization with all objects." +msgstr "Synkronoi kaikki objektit" + +#. module: base_synchro +#: view:base.synchro.obj.line:0 +#: field:base.synchro.obj.line,name:0 +msgid "Date" +msgstr "Päivämäärä" + +#. module: base_synchro +#: field:base.synchro.server,password:0 +msgid "Password" +msgstr "Salasana" + +#. module: base_synchro +#: field:base.synchro.obj,avoid_ids:0 +msgid "Fields Not Sync." +msgstr "Ei synkronoidut kentät" + +#. module: base_synchro +#: selection:base.synchro.obj,action:0 +msgid "Both" +msgstr "Molemmat" + +#. module: base_synchro +#: field:base.synchro.obj,name:0 +msgid "Name" +msgstr "Nimi" + +#. module: base_synchro +#: view:base.synchro.obj:0 +msgid "Fields" +msgstr "Kentät" + +#. module: base_synchro +#: view:base.synchro.obj.line:0 +msgid "Transfered Ids Details" +msgstr "Siirrettyjen tunnusten yksityiskohdat" + +#. module: base_synchro +#: field:base.synchro.obj,action:0 +msgid "Synchronisation direction" +msgstr "Synkronoinnin suunta" + +#. module: base_synchro +#: field:base.synchro.obj,server_id:0 +msgid "Server" +msgstr "Palvelin" + +#. module: base_synchro +#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree +#: model:ir.model,name:base_synchro.model_base_synchro_obj_line +#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree +msgid "Synchronized instances" +msgstr "Synkronoidut instanssit" + +#. module: base_synchro +#: field:base.synchro.obj,active:0 +msgid "Active" +msgstr "Aktiivinen" + +#. module: base_synchro +#: view:base.synchro.obj:0 +#: field:base.synchro.obj,model_id:0 +msgid "Object to synchronize" +msgstr "Synkronoitava objekti" + +#. module: base_synchro +#: model:ir.module.module,shortdesc:base_synchro.module_meta_information +msgid "Base Synchro" +msgstr "Perustietojen synkronointi" + +#. module: base_synchro +#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree +#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id +msgid "Servers to be synchronized" +msgstr "Synkronoitavat palvelimet" + +#. module: base_synchro +#: view:base.synchro.obj:0 +msgid "Transfer Details" +msgstr "Siirron tiedot" + +#. module: base_synchro +#: field:base.synchro.obj.line,remote_id:0 +msgid "Remote Id" +msgstr "Etätunniste" + +#. module: base_synchro +#: field:base.synchro.obj,line_id:0 +msgid "Ids Affected" +msgstr "kohde id:t" + +#. module: base_synchro +#: model:ir.ui.menu,name:base_synchro.next_id_63 +msgid "History" +msgstr "Historia" + +#. module: base_synchro +#: model:ir.ui.menu,name:base_synchro.next_id_62 +#: model:ir.ui.menu,name:base_synchro.synch_config +msgid "Synchronization" +msgstr "Synkronointi" + +#. module: base_synchro +#: field:base.synchro.obj,domain:0 +msgid "Domain" +msgstr "Toimialue" + +#. module: base_synchro +#: view:base.synchro:0 +msgid "_Synchronize" +msgstr "" + +#. module: base_synchro +#: view:base.synchro:0 +msgid "OK" +msgstr "" + +#. module: base_synchro +#: field:base.synchro.server,name:0 +msgid "Server name" +msgstr "Palvelimen nimi" + +#. module: base_synchro +#: field:base.synchro.obj,sequence:0 +msgid "Sequence" +msgstr "Sekvenssi" + +#. module: base_synchro +#: view:base.synchro:0 +msgid "" +"The synchronisation has been started.You will receive a request when it's " +"done." +msgstr "Synkronointi on aloitettu. Saat pyynnön kun se on valmis." + +#. module: base_synchro +#: field:base.synchro.server,server_port:0 +msgid "Server Port" +msgstr "Palvelimen portti" + +#. module: base_synchro +#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro +msgid "Synchronize objects" +msgstr "Synkronoi objektit" + +#. module: base_synchro +#: view:base.synchro:0 +msgid "Synchronization Complited!" +msgstr "Synkronointi valmis!" + +#. module: base_synchro +#: model:ir.model,name:base_synchro.model_base_synchro +msgid "base.synchro" +msgstr "" + +#. module: base_synchro +#: field:base.synchro.obj.line,local_id:0 +msgid "Local Id" +msgstr "Paikallinen id" + +#. module: base_synchro +#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree +#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form +msgid "Filters" +msgstr "Suotimet" + +#. module: base_synchro +#: selection:base.synchro.obj,action:0 +msgid "Download" +msgstr "Lataa" + +#. module: base_synchro +#: field:base.synchro,server_url:0 +#: field:base.synchro.server,server_url:0 +msgid "Server URL" +msgstr "Palvelimen URL" diff --git a/addons/board/board.py b/addons/board/board.py index 7de35fcc5f8..85f2cce7ef7 100644 --- a/addons/board/board.py +++ b/addons/board/board.py @@ -129,6 +129,7 @@ class board_board(osv.osv): if vids: view_id = vids[0] arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id, context=context) + res['custom_view_id'] = view_id res['arch'] = arch.arch res['arch'] = self._arch_preprocessing(cr, user, res['arch'], context=context) res['toolbar'] = {'print': [], 'action': [], 'relate': []} diff --git a/addons/caldav/i18n/tr.po b/addons/caldav/i18n/tr.po index c88efae7f95..54e72a958c6 100644 --- a/addons/caldav/i18n/tr.po +++ b/addons/caldav/i18n/tr.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-29 10:44+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-06-20 20:57+0000\n" +"Last-Translator: Ayhan KIZILTAN \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-30 04:59+0000\n" -"X-Generator: Launchpad (build 12959)\n" +"X-Launchpad-Export-Date: 2011-06-21 04:37+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: caldav #: view:basic.calendar:0 msgid "Value Mapping" -msgstr "" +msgstr "Değer Eşleme" #. module: caldav #: help:caldav.browse,url:0 msgid "Url of the caldav server, use for synchronization" -msgstr "" +msgstr "Caldav sunucusu url si, senkronize etmek için kullanın" #. module: caldav #: field:basic.calendar.alias,name:0 @@ -35,17 +35,17 @@ msgstr "Dosya ismi" #. module: caldav #: model:ir.model,name:caldav.model_calendar_event_export msgid "Event Export" -msgstr "" +msgstr "Olay Dışaaktarımı" #. module: caldav #: view:calendar.event.subscribe:0 msgid "Provide path for Remote Calendar" -msgstr "" +msgstr "Uzaktan Takvim yolunu belirt" #. module: caldav #: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values msgid "Import .ics File" -msgstr "" +msgstr ".ics Dosyası İçe aktar" #. module: caldav #: view:calendar.event.export:0 @@ -61,7 +61,7 @@ msgstr "Katılımcı" #. module: caldav #: sql_constraint:basic.calendar.fields:0 msgid "Can not map a field more than once" -msgstr "" +msgstr "Birden çok alan eşleştirilemiyor" #. module: caldav #: code:addons/caldav/calendar.py:787 @@ -94,12 +94,12 @@ msgstr "Hizmetler" #. module: caldav #: selection:basic.calendar.fields,fn:0 msgid "Expression as constant" -msgstr "" +msgstr "Sabit İfade" #. module: caldav #: selection:user.preference,device:0 msgid "Evolution" -msgstr "" +msgstr "Evrim" #. module: caldav #: view:calendar.event.import:0 @@ -127,12 +127,12 @@ msgstr "Caldav Sunucusu" #: code:addons/caldav/wizard/calendar_event_subscribe.py:59 #, python-format msgid "Error!" -msgstr "" +msgstr "Hata!" #. module: caldav #: help:caldav.browse,caldav_doc_file:0 msgid "download full caldav Documentation." -msgstr "" +msgstr "Tam calsav Belgesi indir" #. module: caldav #: selection:user.preference,device:0 @@ -210,7 +210,7 @@ msgstr "YAPILACAK" #. module: caldav #: view:calendar.event.export:0 msgid "Export ICS" -msgstr "" +msgstr "ICS Dışaaktar" #. module: caldav #: selection:basic.calendar.fields,fn:0 @@ -221,7 +221,7 @@ msgstr "Alanı Kullan" #: code:addons/caldav/calendar.py:787 #, python-format msgid "Can not create line \"%s\" more than once" -msgstr "" +msgstr "\"%s\" Satırı birden çok oluşturulamıyor" #. module: caldav #: view:basic.calendar:0 @@ -233,24 +233,24 @@ msgstr "Takvim Satırları" #. module: caldav #: model:ir.model,name:caldav.model_calendar_event_subscribe msgid "Event subscribe" -msgstr "" +msgstr "Olay aboneliği" #. module: caldav #: view:calendar.event.import:0 msgid "Import ICS" -msgstr "" +msgstr "ICS içeaktar" #. module: caldav #: view:calendar.event.import:0 #: view:calendar.event.subscribe:0 #: view:user.preference:0 msgid "_Cancel" -msgstr "" +msgstr "_Vazgeç" #. module: caldav #: model:ir.model,name:caldav.model_basic_calendar_event msgid "basic.calendar.event" -msgstr "" +msgstr "temel.Etkinlik.olay" #. module: caldav #: view:basic.calendar:0 @@ -258,7 +258,7 @@ msgstr "" #: selection:basic.calendar.attributes,type:0 #: selection:basic.calendar.lines,name:0 msgid "Event" -msgstr "" +msgstr "Etkinlik" #. module: caldav #: field:document.directory,calendar_collection:0 diff --git a/addons/claim_from_delivery/i18n/fi.po b/addons/claim_from_delivery/i18n/fi.po new file mode 100644 index 00000000000..84fd929478a --- /dev/null +++ b/addons/claim_from_delivery/i18n/fi.po @@ -0,0 +1,33 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-20 10:45+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-21 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: claim_from_delivery +#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery +msgid "Claim" +msgstr "Reklamaatio" + +#. module: claim_from_delivery +#: model:ir.module.module,description:claim_from_delivery.module_meta_information +msgid "Create Claim from delivery order:\n" +msgstr "Luo reklamaatio toimitustilaukselta:\n" + +#. module: claim_from_delivery +#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information +msgid "Claim from delivery" +msgstr "Reklamaatio toimitukselta" diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 19d1198c37c..39927705a22 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -457,8 +457,6 @@ class crm_case(crm_base): if not case.user_id: data['user_id'] = uid self.write(cr, uid, case.id, data) - - self._action(cr, uid, cases, 'open') return True @@ -549,11 +547,14 @@ class crm_case(crm_base): @param ids: List of case Ids @param *args: Tuple Value for additional Params """ + state = 'draft' + if 'crm.phonecall' in args: + state = 'open' cases = self.browse(cr, uid, ids) cases[0].state # to fill the browse record cache self._history(cr, uid, cases, _('Draft')) - self.write(cr, uid, ids, {'state': 'draft', 'active': True}) - self._action(cr, uid, cases, 'draft') + self.write(cr, uid, ids, {'state': state, 'active': True}) + self._action(cr, uid, cases, state) return True def remind_partner(self, cr, uid, ids, context=None, attach=False): @@ -580,9 +581,9 @@ class crm_case(crm_base): """ for case in self.browse(cr, uid, ids, context=context): if not destination and not case.email_from: - raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case")) + return False if not case.user_id.user_email: - raise osv.except_osv(_('Error!'), ("User Email is not specified in Case")) + return False if destination and case.section_id.user_id: case_email = case.section_id.user_id.user_email diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index b7222e4fa53..11f465d8e39 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -143,7 +143,7 @@ class crm_lead(crm_case, osv.osv): domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]"), 'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \ domain="['|',('section_id','=',section_id),('section_id','=',False)]"), - 'channel_id': fields.many2one('res.partner.canal', 'Channel'), + 'channel_id': fields.many2one('res.partner.canal', 'Lead Source'), 'contact_name': fields.char('Contact Name', size=64), 'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity'), diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 45f14c3e2df..c98adb86bb9 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -334,7 +334,7 @@ domain="[('user_id','=', False)]" help="Unassigned Leads" /> - + - + @@ -310,7 +310,7 @@ domain="[]" help="Show Sales Team"/> - + @@ -326,6 +326,7 @@ + diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index cce0d72012c..c643d9db8af 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -52,10 +52,10 @@ class crm_phonecall(crm_base, osv.osv): ('draft', 'Draft'), ('open', 'Todo'), ('cancel', 'Cancelled'), - ('done', 'Done'), - ('pending', 'Pending'), + ('done', 'Held'), + ('pending', 'Not Held'), ], 'State', size=16, readonly=True, - help='The state is set to \'Draft\', when a case is created.\ + help='The state is set to \'Todo\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ \nWhen the case is over, the state is set to \'Done\'.\ \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), @@ -78,14 +78,19 @@ class crm_phonecall(crm_base, osv.osv): the canall which is this opportunity source."), 'date_closed': fields.datetime('Closed', readonly=True), 'date': fields.datetime('Date'), - 'opportunity_id': fields.many2one ('crm.lead', 'Opportunity'), + 'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'), 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]), } + def _get_default_state(self, cr, uid, context=None): + if context and context.get('default_state', False): + return context.get('default_state') + return 'open' + _defaults = { 'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'), 'priority': crm.AVAILABLE_PRIORITIES[2][0], - 'state': 'open', + 'state': _get_default_state, 'user_id': lambda self,cr,uid,ctx: uid, 'active': 1, } @@ -121,14 +126,14 @@ class crm_phonecall(crm_base, osv.osv): return res def case_reset(self, cr, uid, ids, *args): - """Resets case as draft + """Resets case as Todo @param self: The object pointer @param cr: the current row, from the database cursor, @param uid: the current user’s ID for security checks, @param ids: List of case Ids @param *args: Tuple Value for additional Params """ - res = super(crm_phonecall, self).case_reset(cr, uid, ids, args) + res = super(crm_phonecall, self).case_reset(cr, uid, ids, args, 'crm.phonecall') self.write(cr, uid, ids, {'duration': 0.0}) return res diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml index 683cbd9735f..8f0661ab8be 100644 --- a/addons/crm/crm_phonecall_demo.xml +++ b/addons/crm/crm_phonecall_demo.xml @@ -18,6 +18,7 @@ + @@ -33,6 +34,7 @@ + @@ -49,6 +51,7 @@ + diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index 41975d9ced4..55e7657ec05 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -4,7 +4,7 @@ - Inbound + Logged Calls crm.phonecall form tree,calendar - - - + + [('state','=','done')] + - The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity. + This tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity. @@ -90,24 +90,24 @@ form - + - - Outbound + Scheduled Calls crm.phonecall form tree,calendar - - + [('state','!=','done')] + - Outbound Calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team. + Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team. @@ -131,7 +131,7 @@ - diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml index 44487e2aef5..2490526bb0e 100644 --- a/addons/crm/crm_phonecall_view.xml +++ b/addons/crm/crm_phonecall_view.xml @@ -31,20 +31,20 @@ - +