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/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/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/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_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po index 2237e4ba73f..2f343554c2f 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-20 20:46+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-21 04:37+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,7 +918,7 @@ msgstr "" #: field:calendar.todo,count:0 #: field:res.alarm,repeat:0 msgid "Repeat" -msgstr "" +msgstr "Yinele" #. module: base_calendar #: help:calendar.attendee,dir:0 @@ -923,155 +932,155 @@ msgstr "" #: 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 @@ -1160,12 +1171,12 @@ msgstr "" #: 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 +1186,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 @@ -1246,7 +1257,7 @@ msgstr "" #. module: base_calendar #: view:calendar.event:0 msgid "Responsible User" -msgstr "" +msgstr "Sorumlu Kullanıcı" #. module: base_calendar #: selection:calendar.attendee,availability:0 @@ -1254,62 +1265,62 @@ 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 @@ -1320,7 +1331,7 @@ msgstr "" #. module: base_calendar #: view:calendar.event:0 msgid "Details" -msgstr "" +msgstr "Ayrıntılar" #. module: base_calendar #: help:calendar.event,exrule:0 @@ -1329,19 +1340,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 +1363,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 +1380,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 +1489,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 +1498,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 +1646,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 @@ -1657,4 +1674,7 @@ msgstr "" #: 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_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/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 d7b67879a7a..fd9b7780cec 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -331,8 +331,6 @@ class crm_case(object): if not case.user_id: data['user_id'] = uid self.write(cr, uid, case.id, data) - - self._action(cr, uid, cases, 'open') return True @@ -423,11 +421,14 @@ class crm_case(object): @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): @@ -454,9 +455,9 @@ class crm_case(object): """ 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 864e4dfc0a4..090664570e5 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 6a4e7bfd7c7..41af82ec8fc 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -53,10 +53,10 @@ class crm_phonecall(crm_case, 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\'.'), @@ -79,14 +79,19 @@ class crm_phonecall(crm_case, 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, } @@ -122,14 +127,14 @@ class crm_phonecall(crm_case, 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 @@ - +