diff --git a/addons/account/account.py b/addons/account/account.py index 4ceaa9d9e8a..5d48f122a1d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1215,7 +1215,8 @@ class account_move(osv.osv): # # TODO: Check if period is closed ! # - def create(self, cr, uid, vals, context={}): + def create(self, cr, uid, vals, context=None): + context = context or {} if 'line_id' in vals and context.get('copy'): for l in vals['line_id']: if not l[0]: @@ -1256,6 +1257,7 @@ class account_move(osv.osv): return result def copy(self, cr, uid, id, default={}, context={}): + context = context or {} default.update({ 'state':'draft', 'name':'/', @@ -1265,7 +1267,8 @@ class account_move(osv.osv): }) return super(account_move, self).copy(cr, uid, id, default, context) - def unlink(self, cr, uid, ids, context={}, check=True): + def unlink(self, cr, uid, ids, context=None, check=True): + context = context or {} toremove = [] obj_move_line = self.pool.get('account.move.line') for move in self.browse(cr, uid, ids, context): @@ -1605,7 +1608,7 @@ class account_tax_code(osv.osv): if isinstance(ids, (int, long)): ids = [ids] reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write') - return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \ + return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \ for x in reads] def _default_company(self, cr, uid, context={}): @@ -2544,9 +2547,17 @@ class wizard_multi_charts_accounts(osv.osv_memory): if ids: return ids[0] return False + + def _get_default_accounts(self, cr, uid, context=None): + accounts = [{'acc_name':'Current','account_type':'bank'}, + {'acc_name':'Deposit','account_type':'bank'}, + {'acc_name':'Cash','account_type':'cash'}] + return accounts + _defaults = { 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id, 'chart_template_id': _get_chart, + 'bank_accounts_id': _get_default_accounts, 'code_digits': 6, 'seq_journal': True } diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index a982ca51182..f3c2b71122f 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -24,8 +24,6 @@ import time from osv import fields from osv import osv from tools.translate import _ -import tools -from tools import config class account_analytic_line(osv.osv): _inherit = 'account.analytic.line' @@ -82,12 +80,13 @@ class account_analytic_line(osv.osv): return {} product_obj = self.pool.get('product.product') analytic_journal_obj =self.pool.get('account.analytic.journal') + company_obj = self.pool.get('res.company') + product_price_type_obj = self.pool.get('product.price.type') j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context) prod = product_obj.browse(cr, uid, prod_id) if not company_id: company_id = j_id.company_id.id result = 0.0 - is_purchase = False if j_id.type <> 'sale': a = prod.product_tmpl_id.property_account_expense.id @@ -99,8 +98,6 @@ class account_analytic_line(osv.osv): 'for this product: "%s" (id:%d)') % \ (prod.name, prod.id,)) amount_unit = prod.price_get('standard_price', context)[prod.id] - is_purchase = True - else: a = prod.product_tmpl_id.property_account_income.id if not a: @@ -128,9 +125,8 @@ class account_analytic_line(osv.osv): if pricetype.field == 'list_price': flag = True amount_unit = prod.price_get(pricetype.field, context)[prod.id] - amount = amount_unit*unit_amount or 1.0 prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') - amount = amount_unit*unit_amount or 1.0 + amount = amount_unit*unit or 1.0 result = round(amount, prec) if not flag: result *= -1 diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index c16b7c2067e..c6548a36872 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -375,7 +375,7 @@ class account_bank_statement(osv.osv): self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context) self.write(cr, uid, [st.id], {'name': st_number}, context=context) - self.log(cr, uid, st.id, _('Statement %s is confirmed and entries are created.') % st_number) + self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,)) done.append(st.id) return self.write(cr, uid, ids, {'state':'confirm'}, context=context) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 18484a7d1c8..28d2f5a06a6 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -430,7 +430,7 @@ [('type','=','out_invoice')] {'type':'out_invoice', 'journal_type': 'sale'} - Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here. + Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers. @@ -458,7 +458,7 @@ [('type','=','in_invoice')] {'type':'in_invoice', 'journal_type': 'purchase'} - Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices. + Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received. @@ -471,7 +471,7 @@ [('type','=','out_refund')] {'type':'out_refund', 'journal_type': 'sale_refund'} - A customer refund is a credit note to your customer that cancel invoice or a part of it. + Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form. @@ -510,22 +510,5 @@ res_model="account.invoice" src_model="account.journal"/> - - - - diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index ba471f83396..8f47828f9d2 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -635,6 +635,7 @@ [('journal_id.type', '=', 'bank')] {'journal_type':'bank'} + A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record all lines of your statement. When you are in the Payment column of the a line, you can press F1 to open the reconciliation form. @@ -956,7 +957,7 @@ [('parent_id','=',False)] tree - Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs. + The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country. diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 7c955886d37..ea1d2cfeba4 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-15 03:35+0000\n" -"Last-Translator: sugi \n" +"PO-Revision-Date: 2010-10-17 07:44+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -647,7 +647,7 @@ msgstr "Харилцагчийн төлбөрийн нөхцөл" #. module: account #: view:account.move.reconcile:0 msgid "Account Entry Reconcile" -msgstr "Дансны бичилт гүйцээлт" +msgstr "Дансны бичилт бууралт" #. module: account #: wizard_button:account.move.bank.reconcile,init,open:0 @@ -3119,7 +3119,7 @@ msgstr "Аналитик Журнал" #. module: account #: rml:account.general.ledger:0 msgid "Entry Label" -msgstr "Бичлэгийн нэр" +msgstr "Гүйлгээний нэр" #. module: account #: model:process.transition,note:account.process_transition_paymentreconcile0 @@ -3498,7 +3498,9 @@ msgstr "Өдрийн огноо" msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." -msgstr "Өөр валютаар илэрхийлсэн дүн байна" +msgstr "" +"Хэрэв энэ гүйлгээ гадаад валютаар хийгдсэн бол гүйлгээний дүнг гадаад " +"валютаар илэрхийлнэ." #. module: account #: field:account.tax,parent_id:0 @@ -3599,7 +3601,7 @@ msgstr "Шинэ нийлүүлэгчийн буцаалт" #. module: account #: view:account.model:0 msgid "Entry Model" -msgstr "Гүйлгээний модель" +msgstr "Гүйлгээний загвар" #. module: account #: wizard_field:account.general.ledger.report,checktype,amount_currency:0 @@ -3764,7 +3766,7 @@ msgstr "Биелэх огноо" #. module: account #: view:account.subscription:0 msgid "Entry Subscription" -msgstr "захиалгын бичилт" +msgstr "Гүйлгээний тэмдэглэл" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 @@ -4126,6 +4128,8 @@ msgid "" "You can check this box to mark the entry line as a litigation with the " "associated partner" msgstr "" +"Журналын бичилт нь холбогдох харилцагчийн хувьд маргаантай гэж үзвэл энэ " +"нүдийг сонгох хэрэгтэй" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree1 @@ -4478,7 +4482,7 @@ msgstr "Санхүүгийн жилийн дарааллууд" #. module: account #: view:account.model.line:0 msgid "Entry Model Line" -msgstr "Бүртгэл загвар шугам" +msgstr "Гүйлгээний загварын мөр" #. module: account #: view:account.tax.template:0 @@ -4542,7 +4546,7 @@ msgstr "Дансны бичилт" #. module: account #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled msgid "Receivables & Payables" -msgstr "Авлагын данс болон төлбөр" +msgstr "Авлага & Өглөг" #. module: account #: rml:account.general.ledger:0 @@ -4625,7 +4629,7 @@ msgstr "Нийлүүлэгчийн санхүү бүртгэл" #. module: account #: view:account.analytic.account:0 msgid "Analytic Account Statistics" -msgstr "" +msgstr "Аналитик санхүүгийн статистик" #. module: account #: view:wizard.multi.charts.accounts:0 @@ -4657,7 +4661,7 @@ msgstr "Аналитик дансны мод" #. module: account #: wizard_field:account.aged.trial.balance,init,result_selection:0 msgid "Filter on Partners" -msgstr "" +msgstr "Харилцагч дээр шүүлт хийх" #. module: account #: field:account.tax,price_include:0 @@ -4837,7 +4841,7 @@ msgstr "А/к дугаар" #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month msgid "Account cost and revenue by journal (This Month)" -msgstr "" +msgstr "Дансны өртөг, орлого журналаар" #. module: account #: selection:account.partner.balance.report,init,result_selection:0 @@ -5036,7 +5040,7 @@ msgstr "Татварын тайлбар" #. module: account #: help:account.invoice,move_id:0 msgid "Link to the automatically generated account moves." -msgstr "" +msgstr "Дансны автомат үүссэн шилжилтүүд рүү холбох" #. module: account #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0 @@ -5058,7 +5062,7 @@ msgstr "/" #: model:process.node,note:account.process_node_invoiceinvoice0 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0 msgid "Have a number and entries are generated" -msgstr "" +msgstr "Үүсгэгдсэн тоо болон бичлэгүүдийг агуулж байна" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -5094,7 +5098,7 @@ msgstr "Журналын бүтэц" #. module: account #: view:account.subscription.line:0 msgid "Subscription lines" -msgstr "" +msgstr "Бүртгэлийн мөрүүд" #. module: account #: field:account.chart.template,property_account_income:0 @@ -5276,9 +5280,7 @@ msgstr "Томьёолол" #. module: account #: help:account.move.line,currency_id:0 msgid "The optional other currency if it is a multi-currency entry." -msgstr "" -"Тухайн дансны валютаас өөр валютаар бичилт хийх үед хэрэглэгдэх валютын " -"төрөл." +msgstr "Гадаад валютын гүйлгээ бол валютыг сонгоно." #. module: account #: view:account.invoice:0 @@ -5368,7 +5370,7 @@ msgstr "PRO-FORMA" #. module: account #: field:account.move.reconcile,line_partial_ids:0 msgid "Partial Entry lines" -msgstr "" +msgstr "Хэсэгчилсэн журналын бичилт" #. module: account #: help:account.move.line,statement_id:0 @@ -5425,7 +5427,7 @@ msgstr "Төлөлтийн нөхцөл" #. module: account #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Receivable and Payable" -msgstr "" +msgstr "Авлага болон өглөг" #. module: account #: rml:account.account.balance:0 @@ -5528,7 +5530,7 @@ msgstr "Ерөнхий журнал" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Balance" -msgstr "Тэнцэл" +msgstr "Баланс" #. module: account #: rml:account.invoice:0 @@ -5899,7 +5901,7 @@ msgstr "Бичилт тулгах" #. module: account #: field:account.subscription.line,move_id:0 msgid "Entry" -msgstr "Бичилт" +msgstr "Ажил гүйлгээ" #. module: account #: model:process.node,note:account.process_node_paidinvoice0 @@ -6044,7 +6046,7 @@ msgstr "Хэрэглэгч уг дансны гүйлгээг банкны ху #. module: account #: wizard_button:account.subscription.generate,init,generate:0 msgid "Compute Entry Dates" -msgstr "" +msgstr "Гүйлгээний огноо тооцоолол" #. module: account #: view:board.board:0 @@ -6077,7 +6079,7 @@ msgstr "Үнийн нэхэмжлэл" #. module: account #: view:board.board:0 msgid "Aged receivables" -msgstr "Насжилтын авлагын данс" +msgstr "Авлагын насжилт" #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information @@ -6326,7 +6328,7 @@ msgstr "Дансны төрлөөр" #. module: account #: model:ir.model,name:report_account.model_report_aged_receivable msgid "Aged Receivable Till Today" -msgstr "" +msgstr "Өнөөдрийг хүртэлх авлагын насжилт" #. module: account #: model:ir.model,name:report_account.model_report_account_receivable @@ -6368,7 +6370,7 @@ msgstr "Үүсгэх огноо" #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph #: view:report.aged.receivable:0 msgid "Aged Receivable" -msgstr "Насжилтын авлага" +msgstr "Авлагын насжилт" #. module: account #: view:report.invoice.created:0 diff --git a/addons/account/installer.py b/addons/account/installer.py index 845d814aa89..5be0ff88808 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -604,8 +604,7 @@ class account_installer(osv.osv_memory): new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) sales_tax = obj_tax.create(cr, uid, - {'name':'TAX%s%%'%(s_tax*100), - 'description':'TAX%s%%'%(s_tax*100), + {'name':'TAX %s%%'%(s_tax*100), 'amount':s_tax, 'base_code_id':new_tax_code, 'tax_code_id':new_paid_tax_code, diff --git a/addons/account/invoice.py b/addons/account/invoice.py index d2bf4928095..23978296367 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -351,7 +351,7 @@ class account_invoice(osv.osv): if view_type == 'tree': doc = etree.XML(res['arch']) nodes = doc.xpath("//field[@name='partner_id']") - partner_string = 'Customer' + partner_string = _('Customer') if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'): partner_string = _('Supplier') for node in nodes: @@ -363,7 +363,7 @@ class account_invoice(osv.osv): try: res = super(account_invoice, self).create(cr, uid, vals, context) for inv_id, name in self.name_get(cr, uid, [res], context=context): - message = _('Invoice ') + " '" + name + "' "+ _("is waiting for validation.") + message = _("Invoice '%s' is waiting for validation.") % name self.log(cr, uid, inv_id, message) return res except Exception, e: @@ -376,7 +376,7 @@ class account_invoice(osv.osv): def confirm_paid(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'state':'paid'}, context=context) for inv_id, name in self.name_get(cr, uid, ids, context=context): - message = _('Invoice ') + " '" + name + "' "+ _("is marked as paid.") + message = _("Invoice '%s' is paid.") % name self.log(cr, uid, inv_id, message) return True @@ -677,7 +677,7 @@ class account_invoice(osv.osv): return (ref or '').replace('/','') def _get_analytic_lines(self, cr, uid, id): - inv = self.browse(cr, uid, [id])[0] + inv = self.browse(cr, uid, id) cur_obj = self.pool.get('res.currency') company_currency = inv.company_id.currency_id.id @@ -693,6 +693,8 @@ class account_invoice(osv.osv): ref = inv.reference else: ref = self._convert_ref(cr, uid, inv.number) + if not inv.journal_id.analytic_journal_id: + raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (inv.journal_id.name,)) il['analytic_lines'] = [(0,0, { 'name': il['name'], 'date': inv['date_invoice'], @@ -702,7 +704,7 @@ class account_invoice(osv.osv): 'product_id': il['product_id'], 'product_uom_id': il['uos_id'], 'general_account_id': il['account_id'], - 'journal_id': self._get_journal_analytic(cr, uid, inv.type), + 'journal_id': inv.journal_id.analytic_journal_id.id, 'ref': ref, })] return iml @@ -1221,12 +1223,13 @@ class account_invoice(osv.osv): inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0] if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id: - self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid.")) self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context) else: code = invoice.currency_id.code - amt = str(pay_amount) + code + ' on ' + str(invoice.amount_total) + code + ' (' + str(total) + code + ' remaining)' - self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is paid partially: ") + amt) + # TODO: use currency's formatting function + msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)") % \ + (name, pay_amount, code, invoice.amount_total, code, total, code) + self.log(cr, uid, inv_id, msg) self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context) # Update the stored value (fields.function), so we write to trigger recompute @@ -1292,14 +1295,6 @@ class account_invoice_line(osv.osv): 'price_unit': _price_unit_default, } - def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None): - tax_obj = self.pool.get('account.tax') - if price_unit: - taxes = tax_obj.browse(cr, uid, tax_id) - for tax in tax_obj.compute_inv(cr, uid, taxes, price_unit, qty, address_invoice_id, product, partner_id): - price_unit = price_unit - tax['amount'] - return {'price_unit': price_unit,'invoice_line_tax_id': tax_id} - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None): if context is None: context = {} @@ -1399,8 +1394,7 @@ class account_invoice_line(osv.osv): taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False) tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) if type in ('in_invoice', 'in_refund'): - to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit or res.standard_price, qty, address_invoice_id, product, partner_id, context=context) - result.update(to_update) + result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} ) else: result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index dab220b32ce..02536fc184c 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -129,7 +129,7 @@ tree [('parent_id','=',False)] - Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project. + The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account. diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 63117789d41..da689275ba3 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -31,7 +31,7 @@ "access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1 "access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1 "access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0 -"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0 +"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1 "access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1 "access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0 @@ -39,7 +39,7 @@ "access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1 "access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1 "access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1 -"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0 +"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1 "access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1 "access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1 "access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1 @@ -93,48 +93,13 @@ "access_account_tax_code_accountant","account.tax.code accountant","model_account_tax_code","account.group_account_user",1,1,1,1 "access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0 "access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0 -"access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,1,1,1 -"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0 +"access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0 +"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0 -"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,0,0,0 -"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0 -"access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0 -"access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0 -"access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0 -"access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0 -"access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0 -"access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1 -"access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1 -"access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1 -"access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1 -"access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1 -"access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1 -"access_account_fiscalyear_system","account.fiscalyear system","model_account_fiscalyear","base.group_system",1,1,1,1 -"access_account_tax_system","account.tax system","model_account_tax","base.group_system",1,1,1,1 -"access_account_model_system","account.model system","model_account_model","base.group_system",1,1,1,1 -"access_account_subscription_system","account.subscription system","model_account_subscription","base.group_system",1,1,1,1 -"access_account_journal_column_system","account.journal.column system","model_account_journal_column","base.group_system",1,1,1,1 -"access_account_invoice_report_system","account.invoice.report system","model_account_invoice_report","base.group_system",1,0,0,0 -"access_account_entries_report_system","account.entries.report system","model_account_entries_report","base.group_system",1,0,0,0 -"access_analytic_entries_report_system","analytic.entries.report system","model_analytic_entries_report","base.group_system",1,0,0,0 -"access_account_journal_period_system","account.journal.period system","model_account_journal_period","base.group_system",1,0,0,0 -"access_account_invoice_tax_system","account.invoice.tax system","model_account_invoice_tax","base.group_system",1,0,0,0 -"access_account_tax_code_template_system","account.tax.code.template system","model_account_tax_code_template","base.group_system",1,1,1,1 -"access_account_sequence_fiscal_year_system","account.sequence.fiscalyear system","model_account_sequence_fiscalyear","base.group_system",1,1,1,1 -"access_account_fiscal_position_system","account.fiscal.position system","model_account_fiscal_position","base.group_system",1,1,1,1 -"access_account_move_reconcile_system","account.move.reconcile system","model_account_move_reconcile","base.group_system",1,0,0,0 -"access_account_account_system","account.account system","model_account_account","base.group_system",1,1,1,1 -"access_account_analytic_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,1,1,1 -"access_account_model_line_system","account.model.line system","model_account_model_line","base.group_system",1,1,1,1 -"access_account_subscription_line_system","account.subscription.line system","model_account_subscription_line","base.group_system",1,1,1,1 -"access_account_payment_term_system","account.payment.term system","model_account_payment_term","base.group_system",1,1,1,1 -"access_account_payment_term_line_system","account.payment.term.line system","model_account_payment_term_line","base.group_system",1,1,1,1 -"access_report_account_receivable_system","report.account.receivable system","model_report_account_receivable","base.group_system",1,1,1,1 -"access_account_fiscal_position_tax_system","account.fiscal.position.tax system","model_account_fiscal_position_tax","base.group_system",1,1,1,1 -"access_account_fiscal_position_account_template_system","account.fiscal.position.account.template system","model_account_fiscal_position_account_template","base.group_system",1,1,1,1 +"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1 +"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1 "access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1 -"access_account_fiscal_position_account_system","account.fiscal.position.account system","model_account_fiscal_position_account","base.group_system",1,1,1,1 "access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1 "access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0 "access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0 @@ -145,7 +110,6 @@ "access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0 "access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1 "access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1 -"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0 "access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1 "access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1 "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1 diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 0aae9dbe3d0..d91e4771d6f 100644 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -67,8 +67,8 @@ import netsvc, tools, os, time import datetime from mx.DateTime import * - import warnings - warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*") + import warnings + warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*") start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d"))) start = DateTime(int(start.year), int(start.month), int(start.day)) res = {} diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml index f35a2c5480c..f2e278b06ce 100644 --- a/addons/account/wizard/account_chart_view.xml +++ b/addons/account/wizard/account_chart_view.xml @@ -31,6 +31,7 @@ tree,form new + Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account. {'journal_type':'sale','view_mode':False} new + This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable". @@ -31,6 +32,7 @@ {'journal_type':'purchase','view_mode':False} new + This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable". {'journal_type':'bank','view_mode':False} new + This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments. - + diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv index 4db9c88f766..80b9f37db1f 100644 --- a/addons/account_analytic_analysis/security/ir.model.access.csv +++ b/addons/account_analytic_analysis/security/ir.model.access.csv @@ -1,5 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0 -access_account_analytic_account_user,account.analytic.account.user,model_account_analytic_account,base.group_user,1,0,0,0 -access_account_analytic_account_system,account.analytic.account.system,model_account_analytic_account,base.group_system,1,0,0,0 diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv index 708094dc520..f7f141ac15a 100644 --- a/addons/account_analytic_plans/security/ir.model.access.csv +++ b/addons/account_analytic_plans/security/ir.model.access.csv @@ -6,5 +6,3 @@ "access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1 "access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1 "access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1 -"access_account_analytic_plan_system","account.analytic.plan system","model_account_analytic_plan","base.group_system",1,1,1,1 -"access_account_analytic_plan_line_system","account.analytic.plan.line system","model_account_analytic_plan_line","base.group_system",1,1,1,1 diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po new file mode 100644 index 00000000000..2fd75bcc245 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/mn.po @@ -0,0 +1,66 @@ +# Mongolian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-10-16 09:58+0000\n" +"Last-Translator: OpenERP Administrators \n" +"Language-Team: Mongolian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "Агуулахын данс" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Дэлгэцийн XML алдаатай!" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "Үнийн өөрчлөлтийн данс" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" +"Энэ данс нь худалдан авалтын үнэ болон өртгийн үнийн хоорондох үнийн " +"өөрчлөлтийг дүгнэхийн тулд ашиглагдана." diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po index 44d9554c859..c98287d9e32 100644 --- a/addons/account_budget/i18n/sr.po +++ b/addons/account_budget/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 10:57+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 08:22+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv index 9e604ed5bee..b2eb33f3d04 100644 --- a/addons/account_budget/security/ir.model.access.csv +++ b/addons/account_budget/security/ir.model.access.csv @@ -4,7 +4,4 @@ "access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,0,0,0 "access_account_budget_post_accountant","account.budget.post accountant","model_account_budget_post","account.group_account_user",1,1,1,1 "access_crossovered_budget_accountant","crossovered.budget accountant","model_crossovered_budget","account.group_account_user",1,1,1,1 -"access_account_budget_post_system","account.budget.post system","model_account_budget_post","base.group_system",1,0,0,0 -"access_crossovered_budget_system","crossovered.budget system","model_crossovered_budget","base.group_system",1,0,0,0 -"access_crossovered_budget_lines_system","crossovered.budget.lines system","model_crossovered_budget_lines","base.group_system",1,1,1,1 "access_crossovered_budget_lines_accountant","crossovered.budget.lines accountant","model_crossovered_budget_lines","account.group_account_user",1,1,1,1 diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po new file mode 100644 index 00000000000..0750c13f415 --- /dev/null +++ b/addons/account_cancel/i18n/mn.po @@ -0,0 +1,37 @@ +# Mongolian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-08-19 12:03+0000\n" +"PO-Revision-Date: 2010-10-16 08:58+0000\n" +"Last-Translator: OpenERP Administrators \n" +"Language-Team: Mongolian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_cancel +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Дэлгэцийн XML алдаатай!" + +#. module: account_cancel +#: model:ir.module.module,description:account_cancel.module_meta_information +msgid "" +"\n" +" Module adds 'Allow cancelling entries' field on form view of account " +"journal. If set to true it allows user to cancel entries & invoices.\n" +" " +msgstr "" + +#. module: account_cancel +#: model:ir.module.module,shortdesc:account_cancel.module_meta_information +msgid "Account Cancel" +msgstr "Данс цуцлах" diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po index a7212b53edf..0b56b4f2664 100644 --- a/addons/account_coda/i18n/hr.po +++ b/addons/account_coda/i18n/hr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 13:11+0000\n" -"PO-Revision-Date: 2010-10-14 20:51+0000\n" -"Last-Translator: robert \n" +"PO-Revision-Date: 2010-10-15 09:33+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda diff --git a/addons/account_coda/i18n/sr.po b/addons/account_coda/i18n/sr.po index 2c8e5a84e9e..c5af7899172 100644 --- a/addons/account_coda/i18n/sr.po +++ b/addons/account_coda/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 13:11+0000\n" -"PO-Revision-Date: 2010-10-14 11:15+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 08:49+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv index df4faec11ee..3ab8dccd4ad 100644 --- a/addons/account_coda/security/ir.model.access.csv +++ b/addons/account_coda/security/ir.model.access.csv @@ -3,4 +3,3 @@ "access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1 "access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1 "access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0 -"access_account_coda_system","account.coda system","model_account_coda","base.group_system",1,0,0,0 diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 85b21ff9e4e..e246e3659e1 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -86,7 +86,8 @@ form - + diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po index 1501c7191d7..d882a65d26a 100644 --- a/addons/account_followup/i18n/sr.po +++ b/addons/account_followup/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 11:52+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 09:03+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv index ccf257b3ecf..60d179d3cbe 100644 --- a/addons/account_followup/security/ir.model.access.csv +++ b/addons/account_followup/security/ir.model.access.csv @@ -1,9 +1,6 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_account_followup_followup","account_followup.followup","model_account_followup_followup","base.group_system",1,1,1,1 "access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0 "access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1 -"access_account_followup_followup_manager","account_followup.followup.manager","model_account_followup_followup","base.group_system",1,1,1,1 "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1 -"access_account_followup_followup_line_system","account_followup.followup.line system","model_account_followup_followup_line","base.group_system",1,1,1,1 "access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0 "access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1 diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml index c6283ce05dc..0d6a3565784 100644 --- a/addons/account_invoice_layout/account_invoice_layout_view.xml +++ b/addons/account_invoice_layout/account_invoice_layout_view.xml @@ -100,7 +100,7 @@ - + diff --git a/addons/account_invoice_layout/i18n/sr.po b/addons/account_invoice_layout/i18n/sr.po index 58532d22362..ae168dc498c 100644 --- a/addons/account_invoice_layout/i18n/sr.po +++ b/addons/account_invoice_layout/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 12:09+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 09:39+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout diff --git a/addons/account_invoice_layout/security/ir.model.access.csv b/addons/account_invoice_layout/security/ir.model.access.csv index 6eede39eb70..c838392e6eb 100644 --- a/addons/account_invoice_layout/security/ir.model.access.csv +++ b/addons/account_invoice_layout/security/ir.model.access.csv @@ -1,3 +1,2 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1 -access_notify_message_system,notify.message system,model_notify_message,base.group_system,1,1,1,1 diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po index 03ae6c68183..5bd7975811f 100644 --- a/addons/account_payment/i18n/mn.po +++ b/addons/account_payment/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 06:58+0000\n" -"Last-Translator: Jacara \n" +"PO-Revision-Date: 2010-10-15 09:14+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po index a77dfcf2567..0ab2bcf63ff 100644 --- a/addons/account_payment/i18n/ru.po +++ b/addons/account_payment/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 10:53+0000\n" -"Last-Translator: Chertykov Denis \n" +"PO-Revision-Date: 2010-10-16 09:33+0000\n" +"Last-Translator: Nikolay Chesnokov \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment @@ -275,7 +275,7 @@ msgstr "Произвести платежи" #. module: account_payment #: field:payment.line,state:0 msgid "Communication Type" -msgstr "" +msgstr "Тип коммуникации" #. module: account_payment #: model:ir.module.module,shortdesc:account_payment.module_meta_information @@ -332,7 +332,7 @@ msgstr "Партнер" #. module: account_payment #: help:payment.line,communication2:0 msgid "The successor message of Communication." -msgstr "" +msgstr "Приемник сообщения коммуникации" #. module: account_payment #: help:payment.line,info_partner:0 @@ -502,7 +502,7 @@ msgstr "Сумма в валюте партнера" #. module: account_payment #: field:payment.line,communication2:0 msgid "Communication 2" -msgstr "" +msgstr "Коммуникации 2" #. module: account_payment #: field:payment.line,bank_id:0 diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po index d563ea941c0..4fd733e9ea5 100644 --- a/addons/account_payment/i18n/sr.po +++ b/addons/account_payment/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 13:06+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 09:18+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv index 1d39372a6b3..a4b6fe0af5e 100644 --- a/addons/account_payment/security/ir.model.access.csv +++ b/addons/account_payment/security/ir.model.access.csv @@ -7,7 +7,5 @@ "access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0 "access_payment_order_accountant","payment.order accountant","model_payment_order","account.group_account_user",1,1,1,1 "access_payment_order_manager","payment.order manager","model_payment_order","account.group_account_manager",1,0,0,0 -"access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0 -"access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1 "access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1 "access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1 diff --git a/addons/account_reporting/i18n/sr.po b/addons/account_reporting/i18n/sr.po index c79527b314f..38289723f44 100644 --- a/addons/account_reporting/i18n/sr.po +++ b/addons/account_reporting/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 13:59+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 09:23+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting diff --git a/addons/account_reporting/security/ir.model.access.csv b/addons/account_reporting/security/ir.model.access.csv index e84e663dfda..78dfe260864 100644 --- a/addons/account_reporting/security/ir.model.access.csv +++ b/addons/account_reporting/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_color_rml,color.rml,model_color_rml,account.group_account_manager,1,1,1,1 -access_account_report_bs,account.report.bs,model_account_report_bs,base.group_system,1,1,1,1 +access_account_report_bs,account.report.bs,model_account_report_bs,account.group_account_manager,1,1,1,1 diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py deleted file mode 100644 index f96eb08f2fe..00000000000 --- a/addons/account_tax_include/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import account_tax_include - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py deleted file mode 100644 index a6bab18ce01..00000000000 --- a/addons/account_tax_include/__openerp__.py +++ /dev/null @@ -1,44 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - - -{ - 'name': 'Invoices and prices with taxes included', - 'version': '1.0', - 'category': 'Generic Modules/Accounting', - 'description': """Allow the user to work tax included prices. -Especially useful for b2c businesses. - -This module implements the modification on the invoice form. -""", - 'author': 'OpenERP SA', - 'website': 'http://www.openerp.com', - 'depends': ['account'], - 'init_xml': [], - 'update_xml': ['account_tax_include_view.xml'], - 'demo_xml': [], - 'test': ['test/account_tax_include.yml'], - 'installable': True, - 'active': False, - 'certificate': '0070514190381', -} - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py deleted file mode 100644 index afd1ef36ae7..00000000000 --- a/addons/account_tax_include/account_tax_include.py +++ /dev/null @@ -1,228 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import time - -from osv import fields, osv - -class account_invoice(osv.osv): - _inherit = "account.invoice" - _columns = { - 'price_type': fields.selection([('tax_included','Tax included'), - ('tax_excluded','Tax excluded')], - 'Price method', required=True, readonly=True, - states={'draft': [('readonly', False)]}), - } - _defaults = { - 'price_type': 'tax_excluded', - } - - def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None): - map_old_new = {} - refund_ids = [] - for old_inv_id in ids: - new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description, journal_id=journal_id) - refund_ids += new_id - map_old_new[old_inv_id] = new_id[0] - - for old_inv_id in map_old_new.keys(): - old_inv_record = self.read(cr, uid, [old_inv_id], ['price_type'])[0]['price_type'] - self.write(cr, uid, [map_old_new[old_inv_id]], {'price_type' : old_inv_record}) - return refund_ids - -account_invoice() - -class account_invoice_line(osv.osv): - _inherit = "account.invoice.line" - - def _amount_line2(self, cr, uid, ids, name, args, context=None): - """ - Return the subtotal excluding taxes with respect to price_type. - """ - res = {} - tax_obj = self.pool.get('account.tax') - cur_obj = self.pool.get('res.currency') - dec_obj = self.pool.get('decimal.precision') - for line in self.browse(cr, uid, ids): - cur = line.invoice_id and line.invoice_id.currency_id or False - res_init = super(account_invoice_line, self)._amount_line(cr, uid, [line.id], name, args, context) - res[line.id] = { - 'price_subtotal': 0.0, - 'price_subtotal_incl': 0.0, - 'data': [] - } - if not line.quantity: - continue - if line.invoice_id: - product_taxes = [] - if line.product_id: - if line.invoice_id.type in ('out_invoice', 'out_refund'): - product_taxes = filter(lambda x: x.price_include, line.product_id.taxes_id) - else: - product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id) - - if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'): - res[line.id]['price_subtotal_incl'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id] - else: - res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id] - for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity): - res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], dec_obj.precision_get(cr, uid, 'Account')) - else: - res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id] - - if res[line.id]['price_subtotal']: - res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal'] - for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal']/line.quantity, line.quantity): - res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal_incl'] + tax['amount'] - res[line.id]['data'].append(tax) - else: - res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl'] - for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity): - res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount'] - res[line.id]['data'].append(tax) - - res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account')) - res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account')) - return res - - def _price_unit_default(self, cr, uid, context=None): - if context is None: - context = {} - if 'check_total' in context: - t = context['check_total'] - if context.get('price_type', False) == 'tax_included': - for l in context.get('invoice_line', {}): - if len(l) >= 3 and l[2]: - p = l[2].get('price_unit', 0) * (1-l[2].get('discount', 0)/100.0) - t = t - (p * l[2].get('quantity')) - return t - return super(account_invoice_line, self)._price_unit_default(cr, uid, context) - return 0 - - def _get_invoice(self, cr, uid, ids, context=None): - result = {} - for inv in self.pool.get('account.invoice').browse(cr, uid, ids, context=context): - for line in inv.invoice_line: - result[line.id] = True - return result.keys() - - _columns = { - 'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount', - store={'account.invoice':(_get_invoice,['price_type'], 10), 'account.invoice.line': (lambda self, cr, uid, ids, c={}: ids, None,10)}), - 'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount', - store={'account.invoice':(_get_invoice,['price_type'], 10), 'account.invoice.line': (lambda self, cr, uid, ids, c={}: ids, None,10)}), - } - - _defaults = { - 'price_unit': _price_unit_default, - } - - def move_line_get_item(self, cr, uid, line, context=None): - return { - 'type':'src', - 'name':line.name, - 'price_unit':(line.quantity) and (line.price_subtotal / line.quantity) or line.price_subtotal, - 'quantity':line.quantity, - 'price':line.price_subtotal, - 'account_id':line.account_id.id, - 'product_id': line.product_id.id, - 'uos_id':line.uos_id.id, - 'account_analytic_id':line.account_analytic_id.id, - } - - def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None): - if context is None: - context = {} - # if the tax is already included, just return the value without calculations - if context.get('price_type', False) == 'tax_included': - return {'price_unit': price_unit,'invoice_line_tax_id': tax_id} - else: - return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context) - - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None): - # note: will call product_id_change_unit_price_inv with context... - - # Temporary trap, for bad context that came from koo: - - ctx = (context and context.copy()) or {} - ctx.update({'price_type': ctx.get('price_type', 'tax_excluded')}) - return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx) - -account_invoice_line() - -class account_invoice_tax(osv.osv): - _inherit = "account.invoice.tax" - - def compute(self, cr, uid, invoice_id, context=None): - tax_grouped = {} - tax_obj = self.pool.get('account.tax') - cur_obj = self.pool.get('res.currency') - line_obj = self.pool.get('account.invoice.line') - - inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id) - line_ids = map(lambda x: x.id, inv.invoice_line) - - cur = inv.currency_id - company_currency = inv.company_id.currency_id.id - - for line in inv.invoice_line: - data = line_obj._amount_line2(cr, uid, [line.id], [], [], context)[line.id] - for tax in data['data']: - val={} - val['invoice_id'] = inv.id - val['name'] = tax['name'] - val['amount'] = tax['amount'] - val['manual'] = False - val['sequence'] = tax['sequence'] - val['base'] = tax['price_unit'] * line['quantity'] - - if inv.type in ('out_invoice','in_invoice'): - val['base_code_id'] = tax['base_code_id'] - val['tax_code_id'] = tax['tax_code_id'] - val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) - val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) - val['account_id'] = tax['account_collected_id'] or line.account_id.id - else: - val['base_code_id'] = tax['ref_base_code_id'] - val['tax_code_id'] = tax['ref_tax_code_id'] - val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) - val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) - val['account_id'] = tax['account_paid_id'] or line.account_id.id - - key = (val['tax_code_id'], val['base_code_id'], val['account_id']) - if not key in tax_grouped: - tax_grouped[key] = val - else: - tax_grouped[key]['amount'] += val['amount'] - tax_grouped[key]['base'] += val['base'] - tax_grouped[key]['base_amount'] += val['base_amount'] - tax_grouped[key]['tax_amount'] += val['tax_amount'] - - for t in tax_grouped.values(): - t['amount'] = cur_obj.round(cr, uid, cur, t['amount']) - t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount']) - t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount']) - - return tax_grouped - -account_invoice_tax() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_tax_include/account_tax_include_view.xml b/addons/account_tax_include/account_tax_include_view.xml deleted file mode 100644 index 4c103cd0d50..00000000000 --- a/addons/account_tax_include/account_tax_include_view.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - account.tax.exlcuded.view.form - form - account.tax - - - - - - - - - - - account.invoice.vat.exlcuded.view.form - form - account.invoice - - - - - - - - - - account.invoice.supplier.tax_include - form - account.invoice - - - - - - - - - - account.invoice.supplier.tax_include2 - form - account.invoice - - - - - - - - - - account.invoice.supplier.tax_include3 - form - account.invoice - - - - - - - - - - account.invoice.line.tree - account.invoice.line - tree - - - - - - - - - - diff --git a/addons/account_tax_include/i18n/account_tax_include.pot b/addons/account_tax_include/i18n/account_tax_include.pot deleted file mode 100644 index da7622102bd..00000000000 --- a/addons/account_tax_include/i18n/account_tax_include.pot +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01:51+0000\n" -"PO-Revision-Date: 2009-08-28 16:01:51+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" - diff --git a/addons/account_tax_include/i18n/ar.po b/addons/account_tax_include/i18n/ar.po deleted file mode 100644 index 5090a5e011f..00000000000 --- a/addons/account_tax_include/i18n/ar.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.4\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 06:24+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/bg.po b/addons/account_tax_include/i18n/bg.po deleted file mode 100644 index f0b055241cc..00000000000 --- a/addons/account_tax_include/i18n/bg.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:06+0000\n" -"Last-Translator: lem0na \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Невалиден XML за преглед на архитектурата" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Начин на изчисляване" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "С включен данък" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Без данък" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/bs.po b/addons/account_tax_include/i18n/bs.po deleted file mode 100644 index 97a0c10e367..00000000000 --- a/addons/account_tax_include/i18n/bs.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-10 12:26+0000\n" -"Last-Translator: adnan \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Neodgovarajući XML za arhitekturu prikaza!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Cjenovna procedura" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Računi i cijene sa uključenim porezom" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Porez uključen" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Porez nije uključen" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Izračunaj cijene sa porezima" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Sub-ukupno" diff --git a/addons/account_tax_include/i18n/ca.po b/addons/account_tax_include/i18n/ca.po deleted file mode 100644 index ce0276a8c26..00000000000 --- a/addons/account_tax_include/i18n/ca.po +++ /dev/null @@ -1,53 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-29 06:30+0000\n" -"Last-Translator: Jordi Esteve (www.zikzakmedia.com) " -"\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML invàlid per a la definició de la vista!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Mètode preu" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Factures i preus amb impostos inclosos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Impostos inclosos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Impostos exclosos" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Codi pel càlcul dels preus amb impostos inclosos" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po deleted file mode 100644 index a8958b780d7..00000000000 --- a/addons/account_tax_include/i18n/cs.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 23:35+0000\n" -"Last-Translator: mga (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Neplatný XML pro zobrazení architektury" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Metoda určování cen" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Faktury a ceny včetně daní" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Daně zahrnuty" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Daně vyloučeny" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Výpočetní kód pro ceny včetně daně" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Mezisoučet" diff --git a/addons/account_tax_include/i18n/de.po b/addons/account_tax_include/i18n/de.po deleted file mode 100644 index 4635a414aaa..00000000000 --- a/addons/account_tax_include/i18n/de.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-09 13:20+0000\n" -"Last-Translator: Ferdinand @ ChriCar \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Fehlerhafter xml Code für diese Ansicht!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Preismethode" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Rechnungen und Preise mit inkludierten Steuern" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Steuer inklusive" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Steuern exklusive" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Berechnungsgrundlage (inkl. Steuer)" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Zwischensumme" diff --git a/addons/account_tax_include/i18n/el.po b/addons/account_tax_include/i18n/el.po deleted file mode 100644 index 74d719a9b9e..00000000000 --- a/addons/account_tax_include/i18n/el.po +++ /dev/null @@ -1,53 +0,0 @@ -# Greek translation for openobject-addons -# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:27+0000\n" -"Last-Translator: Makis Nicolaou \n" -"Language-Team: Greek \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Άκυρο XML για την αρχιτεκτονική όψης!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Μέθοδος Τιμής" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Τιμολόγια και τιμές με ενσωμάτωση φόρων" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Συμπερίληψη φόρου" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Εξαιρούνται φόροι" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Κωδικός Υπολογισμού για Φόρους που εμπεριέχονται στις τιμές" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Υποσύνολο" diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po deleted file mode 100644 index 4c0e3609f24..00000000000 --- a/addons/account_tax_include/i18n/en_AU.po +++ /dev/null @@ -1,53 +0,0 @@ -# English (Australia) translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-05-09 21:19+0000\n" -"Last-Translator: MoLE \n" -"Language-Team: English (Australia) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Invalid XML for View Architecture!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Price method" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Invoices and prices with taxes included" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Tax included" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Tax excluded" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Compute Code for Taxes included prices" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/en_GB.po b/addons/account_tax_include/i18n/en_GB.po deleted file mode 100644 index cd72d7a2cac..00000000000 --- a/addons/account_tax_include/i18n/en_GB.po +++ /dev/null @@ -1,53 +0,0 @@ -# English (United Kingdom) translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-05-09 21:20+0000\n" -"Last-Translator: MoLE \n" -"Language-Team: English (United Kingdom) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Invalid XML for View Architecture!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Price method" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Invoices and prices with taxes included" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Tax included" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Tax excluded" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Compute Code for Taxes included prices" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/es.po b/addons/account_tax_include/i18n/es.po deleted file mode 100644 index b01d20c9ec8..00000000000 --- a/addons/account_tax_include/i18n/es.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-24 20:17+0000\n" -"Last-Translator: Borja López Soilán (Pexego) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "¡XML inválido para la definición de la vista!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Método precio" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Facturas y precios con impuestos incluidos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Impuestos incluidos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Impuestos excluidos" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Código para el cálculo de precios con impuestos incluidos" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/es_AR.po b/addons/account_tax_include/i18n/es_AR.po deleted file mode 100644 index a9cc40c0d4c..00000000000 --- a/addons/account_tax_include/i18n/es_AR.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-14 18:28+0000\n" -"Last-Translator: Silvana Herrera \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML inválido para la definición de la vista!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Método de precio" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Facturas y precios con impuestos incluidos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Impuestos incluidos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Impuestos no incluidos" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Código del cálculo para precios con impuestos incluídos" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/es_EC.po b/addons/account_tax_include/i18n/es_EC.po deleted file mode 100644 index 1858f2a52bc..00000000000 --- a/addons/account_tax_include/i18n/es_EC.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-17 17:47+0000\n" -"Last-Translator: Borja López Soilán (Pexego) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "¡XML inválido para la definición de la vista!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Método precio" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Facturas y precios con impuestos incluidos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Impuestos incluidos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Impuestos excluidos" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Código para el cálculo de precios con impuestos incluidos" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/et.po b/addons/account_tax_include/i18n/et.po deleted file mode 100644 index d4398a2ae58..00000000000 --- a/addons/account_tax_include/i18n/et.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 16:28+0000\n" -"Last-Translator: Fabien (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Vigane XML vaate arhitektuurile!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Hinna meetod" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Makse sisaldavad arved ja hinnad" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Maksuga" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Maksuta" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Arvuta kood maksuga hindadele" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Vahesumma" diff --git a/addons/account_tax_include/i18n/fi.po b/addons/account_tax_include/i18n/fi.po deleted file mode 100644 index 0b8e8dfcee2..00000000000 --- a/addons/account_tax_include/i18n/fi.po +++ /dev/null @@ -1,53 +0,0 @@ -# Finnish translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 23:40+0000\n" -"Last-Translator: mga (Open ERP) \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: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Virheellinen XML näkymä-arkkitehtuurille!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Hinnan tyyppi" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Laskut ja hinnat veroilla" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Vero sisältyy" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Ilman veroa" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Laske koodi hinnoille joissa on vero mukana" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Välisumma" diff --git a/addons/account_tax_include/i18n/fr.po b/addons/account_tax_include/i18n/fr.po deleted file mode 100644 index 3f912c6ffba..00000000000 --- a/addons/account_tax_include/i18n/fr.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 09:23+0000\n" -"Last-Translator: Fabien (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML non valide pour l'architecture de la vue" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Méthode de prix" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Factures et prix avec taxes comprises" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Taxe comprise" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Hors-taxe" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Code de calcul pour les prix taxes comprises" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Sous-total" diff --git a/addons/account_tax_include/i18n/gl.po b/addons/account_tax_include/i18n/gl.po deleted file mode 100644 index 96e95387061..00000000000 --- a/addons/account_tax_include/i18n/gl.po +++ /dev/null @@ -1,54 +0,0 @@ -# translation of account-tax-include-es.po to Galego -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -# Frco. Javier Rial Rodríguez , 2009. -msgid "" -msgstr "" -"Project-Id-Version: account-tax-include-es\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:37+0000\n" -"Last-Translator: Fabien (Open ERP) \n" -"Language-Team: Galego \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "¡XML non válido para a definición da vista!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Método prezo" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Facturas e prezos con impostos incluídos" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Imposto incluído" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Imposto excluído" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Código para o cálculo dos impostos en prezos incluídos" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/hr.po b/addons/account_tax_include/i18n/hr.po deleted file mode 100644 index ba46ce2f95a..00000000000 --- a/addons/account_tax_include/i18n/hr.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 23:43+0000\n" -"Last-Translator: Dragan Jovanovic \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Nevažeći XML za Arhitekturu Prikaza!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Cjenovna metoda" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Računi i cijene sa uključenim porezom" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Porez uključen" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Nije uključen porez" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Kod za izračun cijena sa uključenim porezima" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Podzbroj" diff --git a/addons/account_tax_include/i18n/hu.po b/addons/account_tax_include/i18n/hu.po deleted file mode 100644 index 5090a5e011f..00000000000 --- a/addons/account_tax_include/i18n/hu.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.4\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 06:24+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/id.po b/addons/account_tax_include/i18n/id.po deleted file mode 100644 index e0d1f76a6b1..00000000000 --- a/addons/account_tax_include/i18n/id.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 14:41+0000\n" -"Last-Translator: mga (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML tidak valid untuk Menampilkan Arsitektur!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Metode Harga" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Faktur dan harga sudah termasuk pajak" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Termasuk Pajak" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Tidak termasuk pajak" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "menghitung kode untuk Pajak termasuk harga" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Sub Total" diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po deleted file mode 100644 index 8b6d0f9df36..00000000000 --- a/addons/account_tax_include/i18n/it.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.4\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 07:31+0000\n" -"Last-Translator: OpenERP Administrators \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML non valido per Visualizzazione Architettura!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Metodo di pagamento" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Tasse incluse" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Tasse escluse" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotale" diff --git a/addons/account_tax_include/i18n/ko.po b/addons/account_tax_include/i18n/ko.po deleted file mode 100644 index 254d3ffc1b1..00000000000 --- a/addons/account_tax_include/i18n/ko.po +++ /dev/null @@ -1,53 +0,0 @@ -# Korean translation for openobject-addons -# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2009. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 16:43+0000\n" -"Last-Translator: ekodaq \n" -"Language-Team: Korean \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "뷰 아키텍처의 XML이 유효하지 않습니다." - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "가격 방식" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "세금이 포함된 인보이스와 가격" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "세금 포함" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "세금 제외" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "세금 포함 가격을 위한 컴퓨터 코드" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "서브토털" diff --git a/addons/account_tax_include/i18n/lt.po b/addons/account_tax_include/i18n/lt.po deleted file mode 100644 index 35af6cdcb04..00000000000 --- a/addons/account_tax_include/i18n/lt.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:54+0000\n" -"Last-Translator: Donatas Stonys TeraxIT \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/nb.po b/addons/account_tax_include/i18n/nb.po deleted file mode 100644 index a457b6a3c49..00000000000 --- a/addons/account_tax_include/i18n/nb.po +++ /dev/null @@ -1,53 +0,0 @@ -# Norwegian Bokmal translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-09 07:22+0000\n" -"Last-Translator: OpenERP Administrators \n" -"Language-Team: Norwegian Bokmal \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Ugyldig XML for visningsarkitektur!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/nl.po b/addons/account_tax_include/i18n/nl.po deleted file mode 100644 index cfccf0663d4..00000000000 --- a/addons/account_tax_include/i18n/nl.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-14 21:11+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Ongeldige XML voor weergave!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Prijsmethode" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Facturen en prijzen inclusief belastingen" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Inclusief belastingen" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Exclusief belastingen" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Bereken code voor prijzen inclusief belastingen" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotaal" diff --git a/addons/account_tax_include/i18n/nl_BE.po b/addons/account_tax_include/i18n/nl_BE.po deleted file mode 100644 index 68a51f90ec3..00000000000 --- a/addons/account_tax_include/i18n/nl_BE.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.0\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-24 15:12+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/oc.po b/addons/account_tax_include/i18n/oc.po deleted file mode 100644 index 95700dc830e..00000000000 --- a/addons/account_tax_include/i18n/oc.po +++ /dev/null @@ -1,53 +0,0 @@ -# Occitan (post 1500) translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 23:48+0000\n" -"Last-Translator: Cédric VALMARY (Tot en òc) \n" -"Language-Team: Occitan (post 1500) \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML invalid per l'arquitectura de la vista" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Metòde de prètz" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Facturas e prèses amb taxas inclusas" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Taxa inclusa" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Fòra taxa" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Còde de calcul pels prèses amb taxas compresas" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Sostotal" diff --git a/addons/account_tax_include/i18n/pl.po b/addons/account_tax_include/i18n/pl.po deleted file mode 100644 index efa5a2bfdfb..00000000000 --- a/addons/account_tax_include/i18n/pl.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-21 15:43+0000\n" -"Last-Translator: Andrzej MoST (Marcin Ostajewski) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML niewłaściwy dla tej architektury wyświetlania!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Metoda wyceny" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Faktury i ceny zawierające podatki." - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Zawiera podatek" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Nie zawiera podatku" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Wylicz kod dla cen z podatkiem" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Suma częściowa" diff --git a/addons/account_tax_include/i18n/pt.po b/addons/account_tax_include/i18n/pt.po deleted file mode 100644 index 9f5c11b9832..00000000000 --- a/addons/account_tax_include/i18n/pt.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 23:49+0000\n" -"Last-Translator: mga (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML inválido para a arquitectura da vista" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Método do preço" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Facturas e preços com imposto incluído" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Imposto incluído" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Imposto excluído" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Código de cálculo para preços com imposto incluído" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/pt_BR.po b/addons/account_tax_include/i18n/pt_BR.po deleted file mode 100644 index bd8ff06c8e4..00000000000 --- a/addons/account_tax_include/i18n/pt_BR.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:28+0000\n" -"Last-Translator: Pedro_Maschio \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Invalido XML para Arquitetura da View" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/ro.po b/addons/account_tax_include/i18n/ro.po deleted file mode 100644 index c6c5a81169c..00000000000 --- a/addons/account_tax_include/i18n/ro.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 23:52+0000\n" -"Last-Translator: mga (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "XML invalid pentru arhitectura machetei de afișare !" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Metoda de pret" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Facturi şi preţuri cu taxele incluse" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Taxe incluse" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Fără taxe" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Calcul cod pentru preţuri cu taxe incluse" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po deleted file mode 100644 index 0d7efd3ffdf..00000000000 --- a/addons/account_tax_include/i18n/ru.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-06-06 06:51+0000\n" -"Last-Translator: mr.The \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Неправильный XML для просмотра архитектуры!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Метод расчета цены" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Счета и цены с налогами" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "С налогами" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "До налогов" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Выполнить код для цен с налогами" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Промежуточный итог" diff --git a/addons/account_tax_include/i18n/sk.po b/addons/account_tax_include/i18n/sk.po deleted file mode 100644 index eedd88d3edc..00000000000 --- a/addons/account_tax_include/i18n/sk.po +++ /dev/null @@ -1,53 +0,0 @@ -# Slovak translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 23:53+0000\n" -"Last-Translator: Peter Kohaut \n" -"Language-Team: Slovak \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Neplatné XML pre zobrazenie architektúry!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Faktúry a ceny zahrnuté s DPH" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Medzisúčet" diff --git a/addons/account_tax_include/i18n/sl.po b/addons/account_tax_include/i18n/sl.po deleted file mode 100644 index 22db03c5894..00000000000 --- a/addons/account_tax_include/i18n/sl.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 09:23+0000\n" -"Last-Translator: Fabien (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Neveljaven XML za arhitekturo pogleda." - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Metoda cene" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Računi in cene z vključenimi davki" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Davek vključen" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Davek ni vključen" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Koda izračuna za davke v cenah" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Delna vsota" diff --git a/addons/account_tax_include/i18n/sq.po b/addons/account_tax_include/i18n/sq.po deleted file mode 100644 index 7c7b2189fd2..00000000000 --- a/addons/account_tax_include/i18n/sq.po +++ /dev/null @@ -1,53 +0,0 @@ -# Albanian translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 14:41+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Albanian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/sr.po b/addons/account_tax_include/i18n/sr.po deleted file mode 100644 index a74323d1144..00000000000 --- a/addons/account_tax_include/i18n/sr.po +++ /dev/null @@ -1,53 +0,0 @@ -# Serbian translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 14:04+0000\n" -"Last-Translator: zmmaj \n" -"Language-Team: Serbian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Nevažeći XML za pregled arhitekture" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Cenovna metoda" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Računi i cene sa uključenim porezom" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "Porez uključen" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "Nije uključen porez" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "Kompjuterski kod za izračunavanje cijena sa uključenim porezima" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Subtotal" diff --git a/addons/account_tax_include/i18n/sv.po b/addons/account_tax_include/i18n/sv.po deleted file mode 100644 index 30a63ed1824..00000000000 --- a/addons/account_tax_include/i18n/sv.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 02:42+0000\n" -"Last-Translator: mga (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Felaktig XML för Vyarkitektur!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/tlh.po b/addons/account_tax_include/i18n/tlh.po deleted file mode 100644 index 334e888d03d..00000000000 --- a/addons/account_tax_include/i18n/tlh.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev_rc3\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 06:24+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po deleted file mode 100644 index a719aaf1b2b..00000000000 --- a/addons/account_tax_include/i18n/tr.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-09 06:58+0000\n" -"Last-Translator: Fabien (Open ERP) \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Görüntüleme mimarisi için Geçersiz XML" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "Fiyat Yöntemi" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "Vergiler dahil fiyat ve faturalar" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "KDV Dahil" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "KDV Hariç" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "Alt Toplam" diff --git a/addons/account_tax_include/i18n/uk.po b/addons/account_tax_include/i18n/uk.po deleted file mode 100644 index 8b467132fb9..00000000000 --- a/addons/account_tax_include/i18n/uk.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:16+0000\n" -"Last-Translator: Eugene Babiy \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "Неправильний XML для Архітектури Вигляду!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/vi.po b/addons/account_tax_include/i18n/vi.po deleted file mode 100644 index 055c2581901..00000000000 --- a/addons/account_tax_include/i18n/vi.po +++ /dev/null @@ -1,53 +0,0 @@ -# Vietnamese translation for openobject-addons -# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 14:41+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po deleted file mode 100644 index b5ed33802ae..00000000000 --- a/addons/account_tax_include/i18n/zh_CN.po +++ /dev/null @@ -1,63 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-07-13 16:34+0000\n" -"Last-Translator: Black Jack \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "无效XML视图结构!" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "价格规则" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "发票和含税价" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "含税" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "不含税" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "含税价格计算代码" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "小计" - -#~ msgid "" -#~ "Allow the user to work tax included prices.\n" -#~ "Especially useful for b2c businesses.\n" -#~ " \n" -#~ "This module implement the modification on the invoice form.\n" -#~ msgstr "" -#~ "允许用户使用含税价格\n" -#~ "特别适用于B2C商务\n" -#~ "\n" -#~ "这模块使发票的格式生效\n" diff --git a/addons/account_tax_include/i18n/zh_TW.po b/addons/account_tax_include/i18n/zh_TW.po deleted file mode 100644 index cc456963251..00000000000 --- a/addons/account_tax_include/i18n/zh_TW.po +++ /dev/null @@ -1,52 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_tax_include -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 5.0.4\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-01-30 12:43+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n" -"X-Generator: Launchpad (build Unknown)\n" - -#. module: account_tax_include -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice,price_type:0 -msgid "Price method" -msgstr "" - -#. module: account_tax_include -#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information -msgid "Invoices and prices with taxes included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax included" -msgstr "" - -#. module: account_tax_include -#: selection:account.invoice,price_type:0 -msgid "Tax excluded" -msgstr "" - -#. module: account_tax_include -#: view:account.tax:0 -msgid "Compute Code for Taxes included prices" -msgstr "" - -#. module: account_tax_include -#: field:account.invoice.line,price_subtotal_incl:0 -msgid "Subtotal" -msgstr "" diff --git a/addons/account_tax_include/test/account_tax_include.yml b/addons/account_tax_include/test/account_tax_include.yml deleted file mode 100644 index a4b0f8531b9..00000000000 --- a/addons/account_tax_include/test/account_tax_include.yml +++ /dev/null @@ -1,93 +0,0 @@ - -- - Creating a tax record -- - !record {model: account.tax, id: account_tax_a0}: - amount: 0.10000000000000001 - applicable_type: 'true' - company_id: base.main_company - description: a - name: a - sequence: 1 - type: percent - type_tax_use: all - -- - Creating a account invoice record with tax excluded -- - !record {model: account.invoice, id: account_invoice_tax_exclude}: - account_id: account.a_recv - address_contact_id: base.res_partner_address_3000 - address_invoice_id: base.res_partner_address_3000 - company_id: base.main_company - currency_id: base.EUR - invoice_line: - - account_id: account.a_sale - name: '[PC1] Basic PC' - price_unit: 100.0 - quantity: 1.0 - invoice_line_tax_id: - - account_tax_a0 - product_id: product.product_product_pc1 - uos_id: product.product_uom_unit - journal_id: account.sales_journal - partner_id: base.res_partner_desertic_hispafuentes - price_type: tax_excluded - reference_type: none - -- - Performing an osv_memory action button_reset_taxes on module account.invoice -- - !python {model: account.invoice}: | - self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_exclude")], {"lang": "en_US", "tz": False, - "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")], - "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"), - }) -- - Check if tax is excluded in invoice -- - !assert {model: account.invoice, id: account_invoice_tax_exclude, severity: error, string: price type is tax excluded}: - - state == "draft" - - amount_untaxed == 100.0 - - amount_tax == 10.0 - - amount_total == 110.0 - -- - Creating a account invoice record with tax include -- - !record {model: account.invoice, id: account_invoice_tax_include}: - account_id: account.a_recv - address_contact_id: base.res_partner_address_3000 - address_invoice_id: base.res_partner_address_3000 - company_id: base.main_company - currency_id: base.EUR - invoice_line: - - account_id: account.a_sale - name: '[PC1] Basic PC' - price_unit: 100.0 - quantity: 1.0 - invoice_line_tax_id: - - account_tax_a0 - product_id: product.product_product_pc1 - uos_id: product.product_uom_unit - journal_id: account.sales_journal - partner_id: base.res_partner_desertic_hispafuentes - price_type: tax_included - reference_type: none - -- - Performing an osv_memory action button_reset_taxes on module account.invoice -- - !python {model: account.invoice}: | - self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_include")], {"lang": "en_US", "tz": False, - "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")], - "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"), - }) -- - Check if tax is included in invoice -- - !assert {model: account.invoice, id: account_invoice_tax_include, severity: error, string: price type is tax included}: - - state == "draft" - - amount_untaxed == 90.91 - - amount_tax == 9.09 - - amount_total == 100.00 \ No newline at end of file diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 33db7b9343f..76c05efbe6d 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -22,7 +22,7 @@ { "name" : "Accounting Voucher Entries", "version" : "1.0", - "author" : 'OpenERP SA & Axelor', + "author" : 'OpenERP SA', "description": """Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... * Voucher Entry diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index abe0e5e5708..6cbedf168f7 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -257,10 +257,9 @@ class account_voucher(osv.osv): total = 0.0 total_tax = 0.0 - for line in line_ids: line_amount = 0.0 - line_amount = line[2].get('amount') + line_amount = line[2] and line[2].get('amount',0.0) or 0.0 voucher_line_ids += [line[1]] voucher_total += line_amount @@ -573,7 +572,6 @@ class account_voucher(osv.osv): move_pool = self.pool.get('account.move') move_line_pool = self.pool.get('account.move.line') currency_pool = self.pool.get('res.currency') - bank_st_line_obj = self.pool.get('account.bank.statement.line') tax_obj = self.pool.get('account.tax') for inv in self.browse(cr, uid, ids): if inv.move_id: @@ -594,11 +592,6 @@ class account_voucher(osv.osv): 'period_id': inv.period_id and inv.period_id.id or False } move_id = move_pool.create(cr, uid, move) - line_bank_ids = bank_st_line_obj.search(cr, uid, [('voucher_id', '=', inv.id)], context=context) - if line_bank_ids: - bank_st_line_obj.write(cr, uid, line_bank_ids, { - 'move_ids': [(4, move_id, False)] - }) #create the first line manually company_currency = inv.journal_id.company_id.currency_id.id @@ -868,13 +861,20 @@ class account_bank_statement(osv.osv): def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None): voucher_obj = self.pool.get('account.voucher') wf_service = netsvc.LocalService("workflow") - st_line = self.pool.get('account.bank.statement.line').browse(cr, uid, st_line_id, context=context) + bank_st_line_obj = self.pool.get('account.bank.statement.line') + st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context) if st_line.voucher_id: voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context) if st_line.voucher_id.state == 'cancel': voucher_obj.action_cancel_draft(cr, uid, [st_line.voucher_id.id], context=context) wf_service.trg_validate(uid, 'account.voucher', st_line.voucher_id.id, 'proforma_voucher', cr) - return self.pool.get('account.move.line').write(cr, uid, [x.id for x in st_line.voucher_id.move_ids], {'statement_id': st_line.statement_id.id}, context=context) + + v = voucher_obj.browse(cr, uid, st_line.voucher_id.id, context=context) + bank_st_line_obj.write(cr, uid, [st_line_id], { + 'move_ids': [(4, v.move_id.id, False)] + }) + + return self.pool.get('account.move.line').write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context) return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context) account_bank_statement() @@ -918,4 +918,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:======= diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po index abad7de54da..5c134d5bd0e 100644 --- a/addons/account_voucher/i18n/sr.po +++ b/addons/account_voucher/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 14:35+0000\n" +"PO-Revision-Date: 2010-10-17 17:33+0000\n" "Last-Translator: zmmaj \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv index b27392628f0..e2b048dcedd 100644 --- a/addons/account_voucher/security/ir.model.access.csv +++ b/addons/account_voucher/security/ir.model.access.csv @@ -4,6 +4,4 @@ "access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,0,0,0 "access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,0,0,0 "access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1 -"access_account_voucher_system","account.voucher system","model_account_voucher","base.group_system",1,0,0,0 -"access_account_voucher_line_system","account.voucher.line.system","model_account_voucher_line","base.group_system",1,0,0,0 "access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1 diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 8169cac31e3..a8f827e7bb8 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -235,6 +235,7 @@ current + The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills. @@ -342,6 +343,7 @@ current + Sales payment allows you to register the payments you receive from your customers. In order to record a payment, you must enter the customer, the payment method (=the journal) and the payment amount. OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts. diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index ad44b842587..ed6e98ad17d 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -172,6 +172,7 @@ current + When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt. diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po index f2fc1ab5105..77fb1553933 100644 --- a/addons/analytic/i18n/sr.po +++ b/addons/analytic/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-06-18 10:59+0000\n" -"PO-Revision-Date: 2010-10-14 15:01+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 08:47+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po index d65fb0fd7fb..cad00d3772c 100644 --- a/addons/analytic_journal_billing_rate/i18n/sr.po +++ b/addons/analytic_journal_billing_rate/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 15:09+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 09:19+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po index ff890fa4c9e..846409dd53d 100644 --- a/addons/analytic_user_function/i18n/sr.po +++ b/addons/analytic_user_function/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 15:16+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 09:40+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 43de651e554..36a1b60096c 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -2,8 +2,8 @@ - + groups="group_auction_manager,group_auction_user"/> + @@ -82,7 +82,7 @@ + id="menu_auction_object_cat" groups="group_auction_manager"/> @@ -765,7 +765,7 @@ - + - + diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv index 31f3182fa04..5458e6c2ac3 100644 --- a/addons/auction/security/ir.model.access.csv +++ b/addons/auction/security/ir.model.access.csv @@ -18,15 +18,6 @@ "access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1 "access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1 "access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1 -"access_auction_dates_system","auction.dates system","model_auction_dates","base.group_system",1,0,0,0 -"access_auction_lots_system","auction.lots system","model_auction_lots","base.group_system",1,0,0,0 -"access_auction_deposit_system","auction.deposit system","model_auction_deposit","base.group_system",1,0,0,0 -"access_auction_bid_system","auction.bid system","model_auction_bid","base.group_system",1,0,0,0 -"access_auction_artists_system","auction.artists system","model_auction_artists","base.group_system",1,1,1,1 -"access_auction_lot_category_system","auction.lot.category system","model_auction_lot_category","base.group_system",1,1,1,1 -"access_auction_lot_history_system","auction.lot.history system","model_auction_lot_history","base.group_system",1,0,0,0 -"access_auction_deposit_cost_system","auction.deposit.cost system","model_auction_deposit_cost","base.group_system",1,0,0,0 -"access_auction_bid_line_system","auction.bid.line system","model_auction_bid_line","base.group_system",1,0,0,0 "access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0 "access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0 "access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0 diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index dd843449c8c..c2ef5f5d4a4 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -456,7 +456,7 @@ class audittrail_objects_proxy(osv_pool): """ Overrides Object Proxy execute method @param db: the current database - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param object: Object who's values are being changed @param method: get any method and create log @@ -500,49 +500,47 @@ class audittrail_objects_proxy(osv_pool): return self.log_fct(db, uid, model, method, fct_src, *args) return fct_src(db, uid, model, method, *args) - res = my_fct(db, uid, model, method, *args) - cr.close() - return res - + try: + res = my_fct(db, uid, model, method, *args) + return res + finally: + cr.close() def exec_workflow(self, db, uid, model, method, *args, **argv): pool = pooler.get_pool(db) - cr = pooler.get_db(db).cursor() - cr.autocommit(True) logged_uids = [] fct_src = super(audittrail_objects_proxy, self).exec_workflow field = method rule = False model_pool = pool.get('ir.model') rule_pool = pool.get('audittrail.rule') - model_ids = model_pool.search(cr, uid, [('model', '=', model)]) - for obj_name in pool.obj_list(): - if obj_name == 'audittrail.rule': - rule = True - if not rule: - cr.close() - return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) - if not model_ids: - cr.close() - return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) + cr = pooler.get_db(db).cursor() + cr.autocommit(True) + try: + model_ids = model_pool.search(cr, uid, [('model', '=', model)]) + for obj_name in pool.obj_list(): + if obj_name == 'audittrail.rule': + rule = True + if not rule: + return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) + if not model_ids: + return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) - rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')]) - if not rule_ids: - cr.close() - return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) + rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')]) + if not rule_ids: + return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) - for thisrule in rule_pool.browse(cr, uid, rule_ids): - for user in thisrule.user_id: - logged_uids.append(user.id) - if not logged_uids or uid in logged_uids: - if thisrule.log_workflow: - cr.close() - return self.log_fct(db, uid, model, method, fct_src, *args) + for thisrule in rule_pool.browse(cr, uid, rule_ids): + for user in thisrule.user_id: + logged_uids.append(user.id) + if not logged_uids or uid in logged_uids: + if thisrule.log_workflow: + return self.log_fct(db, uid, model, method, fct_src, *args) + return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) + + return True + finally: cr.close() - return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv) - - cr.close() - return True audittrail_objects_proxy() diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml index 218db24d89a..5fdcfcd5558 100644 --- a/addons/audittrail/audittrail_view.xml +++ b/addons/audittrail/audittrail_view.xml @@ -55,7 +55,7 @@ - Rules + Audit Rules audittrail.rule ir.actions.act_window form @@ -63,12 +63,8 @@ - - + action="action_audittrail_rule_tree" parent="base.menu_audit" /> @@ -152,12 +148,12 @@ - Logs + Audit Logs audittrail.log form + action="action_audittrail_log_tree" parent="base.menu_audit" /> diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po index 9bc201a24c2..30a63c8c88d 100644 --- a/addons/audittrail/i18n/ru.po +++ b/addons/audittrail/i18n/ru.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 00:52+0000\n" -"Last-Translator: mga (Open ERP) \n" +"PO-Revision-Date: 2010-10-16 09:06+0000\n" +"Last-Translator: Nikolay Chesnokov \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail #: model:ir.module.module,shortdesc:audittrail.module_meta_information msgid "Audit Trail" -msgstr "" +msgstr "Проведение аудита" #. module: audittrail #: constraint:ir.model:0 @@ -43,6 +43,8 @@ msgstr "Подписка" #: view:audittrail.log:0 msgid "Old Value : " msgstr "" +"Старое значение.\\nпредставление пробела. Введите пробел в эквивалентную " +"позицию перевода " #. module: audittrail #: selection:audittrail.log,method:0 @@ -52,7 +54,7 @@ msgstr "Создать" #. module: audittrail #: wizard_view:audittrail.view.log,init:0 msgid "Audit Logs" -msgstr "" +msgstr "Логи аудита" #. module: audittrail #: field:audittrail.rule,state:0 @@ -82,7 +84,7 @@ msgstr "Просмотреть журнал" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_log_line msgid "audittrail.log.line" -msgstr "" +msgstr "Строки лога аудита" #. module: audittrail #: field:audittrail.log,method:0 @@ -92,17 +94,17 @@ msgstr "Метод" #. module: audittrail #: wizard_field:audittrail.view.log,init,from:0 msgid "Log From" -msgstr "" +msgstr "Форма лога" #. module: audittrail #: field:audittrail.log.line,log:0 msgid "Log ID" -msgstr "" +msgstr "Идентификатор лога" #. module: audittrail #: field:audittrail.log,res_id:0 msgid "Resource Id" -msgstr "" +msgstr "Идентификатор записи" #. module: audittrail #: selection:audittrail.log,method:0 @@ -112,12 +114,12 @@ msgstr "Написать" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail msgid "Audittrails" -msgstr "" +msgstr "Проведение аудита" #. module: audittrail #: view:audittrail.log:0 msgid "Log Lines" -msgstr "" +msgstr "Строки лога" #. module: audittrail #: view:audittrail.rule:0 @@ -138,17 +140,17 @@ msgstr "Объект" #. module: audittrail #: view:audittrail.rule:0 msgid "AuditTrail Rule" -msgstr "" +msgstr "Правила проведения аудита" #. module: audittrail #: wizard_field:audittrail.view.log,init,to:0 msgid "Log To" -msgstr "" +msgstr "Запись лога по" #. module: audittrail #: view:audittrail.log:0 msgid "New Value Text: " -msgstr "" +msgstr "Новое значение текста: " #. module: audittrail #: model:ir.module.module,description:audittrail.module_meta_information @@ -158,6 +160,9 @@ msgid "" " Subscribe Rules for read, write, create and delete on objects and check " "logs" msgstr "" +"Позволяет администратору отслеживать операции каждого пользователя по всем " +"объектам системы.\\nУстанавливает правила читать, писать, создавать и " +"удалять на объектах и проверить журналы." #. module: audittrail #: field:audittrail.log,timestamp:0 @@ -172,7 +177,7 @@ msgstr "Пользователь" #. module: audittrail #: view:audittrail.log:0 msgid "Old Value Text : " -msgstr "" +msgstr "Старое значение текста: " #. module: audittrail #: constraint:ir.ui.view:0 @@ -187,12 +192,12 @@ msgstr "Название" #. module: audittrail #: field:audittrail.log,line_ids:0 msgid "Log lines" -msgstr "" +msgstr "Строги лога" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub msgid "Subscribed Rules" -msgstr "" +msgstr "Правила подписки" #. module: audittrail #: field:audittrail.log.line,field_id:0 @@ -202,12 +207,12 @@ msgstr "Поля" #. module: audittrail #: view:audittrail.rule:0 msgid "AuditTrail Rules" -msgstr "" +msgstr "Правила проведения аудита" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_rule msgid "audittrail.rule" -msgstr "" +msgstr "Правила аудита" #. module: audittrail #: view:audittrail.rule:0 @@ -217,17 +222,17 @@ msgstr "Отписаться" #. module: audittrail #: field:audittrail.rule,log_write:0 msgid "Log writes" -msgstr "" +msgstr "Записи лога" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_log msgid "audittrail.log" -msgstr "" +msgstr "Журнал проведения аудита" #. module: audittrail #: field:audittrail.log.line,field_description:0 msgid "Field Description" -msgstr "" +msgstr "Описание поля" #. module: audittrail #: selection:audittrail.log,method:0 @@ -237,12 +242,12 @@ msgstr "Удалить" #. module: audittrail #: wizard_button:audittrail.view.log,init,open:0 msgid "Open Logs" -msgstr "" +msgstr "Открыть лог" #. module: audittrail #: field:audittrail.log.line,new_value_text:0 msgid "New value Text" -msgstr "" +msgstr "Новое значение текста" #. module: audittrail #: field:audittrail.rule,name:0 @@ -252,7 +257,7 @@ msgstr "Название правила" #. module: audittrail #: field:audittrail.rule,log_read:0 msgid "Log reads" -msgstr "" +msgstr "Чтение лога" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree @@ -262,22 +267,22 @@ msgstr "Журналы" #. module: audittrail #: field:audittrail.log.line,new_value:0 msgid "New Value" -msgstr "" +msgstr "Новое значение" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_log_tree2 msgid "View Logs" -msgstr "" +msgstr "Чтение лога" #. module: audittrail #: field:audittrail.rule,log_create:0 msgid "Log creates" -msgstr "" +msgstr "Созданные журналы" #. module: audittrail #: view:audittrail.log:0 msgid "AuditTrail Logs" -msgstr "" +msgstr "Логи проведения аудита" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree @@ -287,7 +292,7 @@ msgstr "Правила" #. module: audittrail #: view:audittrail.log:0 msgid "New Value : " -msgstr "" +msgstr "Новое значение " #. module: audittrail #: field:audittrail.rule,user_id:0 @@ -297,7 +302,7 @@ msgstr "Пользователи" #. module: audittrail #: field:audittrail.log.line,old_value_text:0 msgid "Old value Text" -msgstr "" +msgstr "Старое значение текста" #. module: audittrail #: wizard_button:audittrail.view.log,init,end:0 @@ -307,4 +312,4 @@ msgstr "Отмена" #. module: audittrail #: field:audittrail.rule,log_unlink:0 msgid "Log deletes" -msgstr "" +msgstr "Удаленные логи" diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv index ac367182f26..877cf622ad4 100644 --- a/addons/audittrail/security/ir.model.access.csv +++ b/addons/audittrail/security/ir.model.access.csv @@ -1,7 +1,4 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_audittrail_rule_group_system","audittrail rule system","model_audittrail_rule","base.group_system",1,1,1,1 -"access_audittrail_log_group_system","audittrail log system","model_audittrail_log","base.group_system",1,1,1,1 -"access_audittrail_logline_group_system","audittrail log line system","model_audittrail_log_line","base.group_system",1,1,1,1 "access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0 "access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0 "access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0 diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 01951b3c9b8..cc8966316fd 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -114,6 +114,7 @@ form tree,form + Create actions automatically triggered based on a user activity in the system.E.g.: an opportunity created by a specific user can be automatically maintained with a specific sales team, or an opportunity which still has status pending after 14 days triggers an automatic reminder email. , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-08-19 12:20+0000\n" +"PO-Revision-Date: 2010-10-17 14:30+0000\n" +"Last-Translator: zmmaj \n" +"Language-Team: Serbian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-18 04:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: base_action_rule +#: help:base.action.rule,act_mail_to_user:0 +msgid "" +"Check this if you want the rule to send an email to the responsible person." +msgstr "Označite ukoliko želite da pravilo šalje email odgovornoj osobi." + +#. module: base_action_rule +#: field:base.action.rule,act_remind_partner:0 +msgid "Remind Partner" +msgstr "Podseti partnera" + +#. module: base_action_rule +#: field:base.action.rule,trg_partner_categ_id:0 +msgid "Partner Category" +msgstr "Kategorija partnera" + +#. module: base_action_rule +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Pogrešno ime modela u definiciji akcije." + +#. module: base_action_rule +#: help:base.action.rule,act_remind_user:0 +msgid "" +"Check this if you want the rule to send a reminder by email to the user." +msgstr "Označite ukoliko želite da pravilo šalje podsjetnik korisniku." + +#. module: base_action_rule +#: field:base.action.rule,trg_state_to:0 +msgid "Button Pressed" +msgstr "Pritisnuto dugme" + +#. module: base_action_rule +#: field:base.action.rule,model_id:0 +msgid "Object" +msgstr "Objekat" + +#. module: base_action_rule +#: field:base.action.rule,act_mail_to_email:0 +msgid "Mail to these Emails" +msgstr "Email za Ostale Emailove" + +#. module: base_action_rule +#: field:base.action.rule,act_state:0 +msgid "Set State to" +msgstr "Postavi stanje na" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Email Body" +msgstr "Email Sadrzaj" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_range_type:0 +msgid "Days" +msgstr "Dana" + +#. module: base_action_rule +#: code:addons/base_action_rule/base_action_rule.py:0 +#, python-format +msgid "Error!" +msgstr "Greška" + +#. module: base_action_rule +#: field:base.action.rule,act_reply_to:0 +msgid "Reply-To" +msgstr "Odgovor - Za" + +#. module: base_action_rule +#: help:base.action.rule,act_email_cc:0 +msgid "" +"These people will receive a copy of the future communication between partner " +"and users by email" +msgstr "" +"Ovi ljudi će email-om primiti kopiju buduće komunikacije između partnera i " +"korisnika" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_range_type:0 +msgid "Minutes" +msgstr "Minute" + +#. module: base_action_rule +#: field:base.action.rule,name:0 +msgid "Rule Name" +msgstr "Naziv pravila" + +#. module: base_action_rule +#: help:base.action.rule,act_remind_partner:0 +msgid "" +"Check this if you want the rule to send a reminder by email to the partner." +msgstr "oznaci ovde ako zelis da pravilo posalje Email podsetnik partnerima" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Email Reminders" +msgstr "Email podsetnici" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions on Model Partner" +msgstr "Uslovi za Model Partnera" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "Deadline" +msgstr "Krajnji Rok" + +#. module: base_action_rule +#: field:base.action.rule,trg_partner_id:0 +msgid "Partner" +msgstr "Partner" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_subject)s = Object subject" +msgstr "%(object_subject)s = Objekt subject" + +#. module: base_action_rule +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Nevažeći XML za pregled arhitekture" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Special Keywords to Be Used in The Body" +msgstr "Specijalne kljucne reci za koriscenje u sadrzaju poruke" + +#. module: base_action_rule +#: field:base.action.rule,trg_state_from:0 +msgid "State" +msgstr "Stanje" + +#. module: base_action_rule +#: help:base.action.rule,act_mail_to_email:0 +msgid "Email-id of the persons whom mail is to be sent" +msgstr "Email-id osoba kojima treba poslati email" + +#. module: base_action_rule +#: view:base.action.rule:0 +#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information +msgid "Action Rule" +msgstr "Pravilo Akcije" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Fields to Change" +msgstr "Polja za Menjanje" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "Creation Date" +msgstr "Datum kreiranja" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "Last Action Date" +msgstr "Datum poslednje akcije" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_range_type:0 +msgid "Hours" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_id)s = Object ID" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Delay After Trigger Date" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_remind_attach:0 +msgid "Remind with Attachment" +msgstr "" + +#. module: base_action_rule +#: constraint:ir.cron:0 +msgid "Invalid arguments" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_user_id:0 +msgid "Set Responsible to" +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "None" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_user_phone)s = Responsible phone" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "" +"The rule uses the AND operator. The model must match all non-empty fields so " +"that the rule executes the action described in the 'Actions' tab." +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_date_range_type:0 +msgid "Delay type" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,regex_name:0 +msgid "" +"Regular expression for matching name of the resource\n" +"e.g.: 'urgent.*' will search for records having name starting with the " +"string 'urgent'\n" +"Note: This is case sensitive search." +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_method:0 +msgid "Call Object Method" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_mail_to_watchers:0 +msgid "" +"Check this if you want the rule to mark CC(mail to any other person defined " +"in actions)." +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(partner)s = Partner name" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Note" +msgstr "" + +#. module: base_action_rule +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_date_range:0 +msgid "Delay after trigger date" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,trg_date_range:0 +msgid "" +"Delay After Trigger Date,specifies you can put a negative number. If you " +"need a delay before the trigger date, like sending a reminder 15 minutes " +"before a meeting." +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,active:0 +msgid "Active" +msgstr "" + +#. module: base_action_rule +#: code:addons/base_action_rule/base_action_rule.py:0 +#, python-format +msgid "No E-Mail ID Found for your Company address!" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_remind_user:0 +msgid "Remind Responsible" +msgstr "" + +#. module: base_action_rule +#: model:ir.module.module,description:base_action_rule.module_meta_information +msgid "This module allows to implement action rules for any object." +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,sequence:0 +msgid "Gives the sequence order when displaying a list of rules." +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_range_type:0 +msgid "Months" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,filter_id:0 +msgid "Filter" +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "Date" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,server_action_id:0 +msgid "" +"Describes the action name.\n" +"eg:on which object which action to be taken on basis of which condition" +msgstr "" + +#. module: base_action_rule +#: model:ir.model,name:base_action_rule.model_ir_cron +msgid "ir.cron" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_description)s = Object description" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Email Actions" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Email Information" +msgstr "" + +#. module: base_action_rule +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: base_action_rule +#: model:ir.model,name:base_action_rule.model_base_action_rule +msgid "Action Rules" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_mail_body:0 +msgid "Content of mail" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_user_id:0 +msgid "Responsible" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(partner_email)s = Partner Email" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_date)s = Creation date" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_user_email)s = Responsible Email" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_mail_body:0 +msgid "Mail body" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_mail_to_watchers:0 +msgid "Mail to Watchers (CC)" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Server Action to be Triggered" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_mail_to_user:0 +msgid "Mail to Responsible" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_email_cc:0 +msgid "Add Watchers (Cc)" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions on Model Fields" +msgstr "" + +#. module: base_action_rule +#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act +#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form +msgid "Automated Actions" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,server_action_id:0 +msgid "Server Action" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,regex_name:0 +msgid "Regex on Resource Name" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_remind_attach:0 +msgid "" +"Check this if you want that all documents attached to the object be attached " +"to the reminder email sent." +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions on Timing" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Actions" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,active:0 +msgid "" +"If the active field is set to False, it will allow you to hide the rule " +"without removing it." +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_user)s = Responsible name" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,create_date:0 +msgid "Create Date" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions on States" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_date_type:0 +msgid "Trigger Date" +msgstr "" diff --git a/addons/base_action_rule/security/ir.model.access.csv b/addons/base_action_rule/security/ir.model.access.csv index c3a69f93e4c..4d2e612b384 100644 --- a/addons/base_action_rule/security/ir.model.access.csv +++ b/addons/base_action_rule/security/ir.model.access.csv @@ -1,3 +1,3 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_base_action_rule","base.action.rule","model_base_action_rule",,1,0,0,0 -"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,1,1,1 \ No newline at end of file +"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,1,1,1 diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 1ff7777cf36..d602fce3a0f 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -306,7 +306,7 @@ class calendar_attendee(osv.osv): res = obj.read(cr, uid, ids, ['object', 'name'], context=context) return [(r['object'], r['name']) for r in res] - def _lang_get(self, cr, uid, context={}): + def _lang_get(self, cr, uid, context=None): """ Get language for language selection field. @param cr: the current row, from the database cursor, @@ -912,10 +912,10 @@ class calendar_event(osv.osv): _description = "Calendar Event" __attribute__ = {} - def _tz_get(self, cr, uid, context={}): + def _tz_get(self, cr, uid, context=None): return [(x.lower(), x) for x in pytz.all_timezones] - def onchange_allday(self, cr, uid, ids, allday, context={}): + def onchange_allday(self, cr, uid, ids, allday, context=None): """Sets duration as 24 Hours if event is selcted for all day @param self: The object pointer @param cr: the current row, from the database cursor, @@ -1017,7 +1017,8 @@ class calendar_event(osv.osv): elif int(val.get('interval')) > 1: #If interval is other than 1 rule is custom rrule_type = 'custom' - qry = "UPDATE %(table)s set rrule_type=\'%(rule_type)s\' " + qry = "UPDATE \"%s\" set rrule_type=%%s " % self._table + qry_args = [ rrule_type, ] if rrule_type == 'custom': new_val = val.copy() @@ -1055,17 +1056,12 @@ class calendar_event(osv.osv): new_val.pop('bymonth') for k, v in new_val.items(): - temp = ", %s='%s'" % (k, v) - qry += temp + qry += ", %s=%%s" % k + qry_args.append(v) - whr = " where id=%(id)s" - qry = qry + whr - val.update({ - 'table': self._table, - 'rule_type': rrule_type, - 'id': id, - }) - cr.execute(qry % val) + qry = qry + " where id=%s" + qry_args.append(id) + cr.execute(qry, qry_args) return True def _get_rulestring(self, cr, uid, ids, name, arg, context=None): @@ -1479,6 +1475,8 @@ true, it will allow you to hide the event alarm information without removing it. if not real_event_id in new_ids: new_ids.append(real_event_id) + if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'): + vals['vtimezone'] = vals['vtimezone'][40:] if new_ids: res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context) if (vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'))\ @@ -1489,7 +1487,7 @@ true, it will allow you to hide the event alarm information without removing it. context=context) return res - def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}): + def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None): """ Overrides orm browse method. @param self: the object pointer @@ -1608,6 +1606,8 @@ true, it will allow you to hide the event alarm information without removing it. """ if not context: context = {} + if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'): + vals['vtimezone'] = vals['vtimezone'][40:] res = super(calendar_event, self).create(cr, uid, vals, context) alarm_obj = self.pool.get('res.alarm') alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context) @@ -1682,7 +1682,7 @@ class calendar_todo(osv.osv): @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]. @param context: A standard dictionary for contextual values """ - + assert name == 'date' return self.write(cr, uid, id, { 'date_start': value }, context=context) diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index b5f234aa7cb..9f27e79d5a5 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -157,12 +157,12 @@ - + - @@ -208,6 +208,7 @@ res.alarm form tree,form + Create specific calendar alarms that can be assigned to calendar events or meetings. diff --git a/addons/base_calendar/i18n/sr.po b/addons/base_calendar/i18n/sr.po new file mode 100644 index 00000000000..084471fb3cd --- /dev/null +++ b/addons/base_calendar/i18n/sr.po @@ -0,0 +1,1565 @@ +# Serbian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-08-19 12:50+0000\n" +"PO-Revision-Date: 2010-10-17 14:09+0000\n" +"Last-Translator: zmmaj \n" +"Language-Team: Serbian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-18 04:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_related:0 +#: selection:res.alarm,trigger_related:0 +msgid "The event starts" +msgstr "Događaj počinje" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Hourly" +msgstr "Po satu" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Required to Join" +msgstr "Očekuje se prisustvovanje" + +#. module: base_calendar +#: help:calendar.event,exdate:0 +#: help:calendar.todo,exdate:0 +msgid "" +"This property defines the list of date/time exceptions for a recurring " +"calendar component." +msgstr "" +"Ovo svojstvo određuje listu ekssepcija datuma/vremena za ponavljajuću " +"komponentu kalendara" + +#. module: base_calendar +#: field:calendar.event.edit.all,name:0 +msgid "Title" +msgstr "Naslov" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,freq:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Monthly" +msgstr "Mesečno" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invited User" +msgstr "Pozvani korisnik" + +#. module: base_calendar +#: 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 "Alarmi" + +#. 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 "Nedelja" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,role:0 +msgid "Role" +msgstr "Uloga" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Invitation details" +msgstr "Detalji poziva" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Fourth" +msgstr "Četvrti" + +#. module: base_calendar +#: field:calendar.event,show_as:0 +#: field:calendar.todo,show_as:0 +msgid "Show as" +msgstr "Prikaži kao" + +#. module: base_calendar +#: field:base.calendar.set.exrule,day:0 +#: selection:base.calendar.set.exrule,select1:0 +#: field:calendar.event,day:0 +#: selection:calendar.event,select1:0 +#: field:calendar.todo,day:0 +#: selection:calendar.todo,select1:0 +msgid "Date of month" +msgstr "Dan u mesecu" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Public" +msgstr "Javno" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Hours" +msgstr "Sati" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "March" +msgstr "Mart" + +#. module: base_calendar +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 +#, python-format +msgid "Warning !" +msgstr "Upozorenje !" + +#. 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 "Petak" + +#. module: base_calendar +#: field:calendar.event,allday:0 +#: field:calendar.todo,allday:0 +msgid "All Day" +msgstr "Celi dan" + +#. module: base_calendar +#: field:base.calendar.set.exrule,select1:0 +#: field:calendar.event,select1:0 +#: field:calendar.todo,select1:0 +msgid "Option" +msgstr "Opcija" + +#. module: base_calendar +#: selection:calendar.attendee,availability:0 +#: selection:calendar.event,show_as:0 +#: selection:calendar.todo,show_as:0 +#: selection:res.users,availability:0 +msgid "Free" +msgstr "Slobodan" + +#. module: base_calendar +#: help:calendar.attendee,rsvp:0 +msgid "Indicats whether the favor of a reply is requested" +msgstr "Indikator da li se očekuje odgovor" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_attachment +msgid "ir.attachment" +msgstr "ir.attachment" + +#. module: base_calendar +#: help:calendar.attendee,delegated_to:0 +msgid "The users that the original request was delegated to" +msgstr "Korisnici kojima je prosleđen originalni zahtev" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,delegated_to:0 +msgid "Delegated To" +msgstr "Delegirano Za" + +#. module: base_calendar +#: field:base.calendar.set.exrule,we:0 +#: field:calendar.event,we:0 +#: field:calendar.todo,we:0 +msgid "Wed" +msgstr "Sreda" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Show time as" +msgstr "Prikaži vreme kao" + +#. module: base_calendar +#: field:base.calendar.set.exrule,tu:0 +#: field:calendar.event,tu:0 +#: field:calendar.todo,tu:0 +msgid "Tue" +msgstr "Utorak" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,freq:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Yearly" +msgstr "Godišnje" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_related:0 +#: selection:res.alarm,trigger_related:0 +msgid "The event ends" +msgstr "Događaj završava" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Last" +msgstr "Posljednji" + +#. module: base_calendar +#: help:calendar.attendee,state:0 +msgid "Status of the attendee's participation" +msgstr "Status prisustvovanja" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Room" +msgstr "Soba" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Days" +msgstr "Dana" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "No Repeat" +msgstr "Bez ponavljanja" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:0 +#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:0 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 +#, python-format +msgid "Error!" +msgstr "Greška" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Chair Person" +msgstr "Glavna Osoba" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Procedure" +msgstr "Procedura" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Select data for Custom Rule" +msgstr "Odaberite podatke za korisničko pravilo" + +#. module: base_calendar +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Cancelled" +msgstr "Otkazano" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_interval:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Minutes" +msgstr "Minuti" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Display" +msgstr "Prikaz" + +#. module: base_calendar +#: view:calendar.event.edit.all:0 +msgid "Edit all Occurrences" +msgstr "Uredi sve događaje" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation type" +msgstr "Tip poziva" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Secondly" +msgstr "Drugo" + +#. module: base_calendar +#: field:calendar.alarm,event_date:0 +#: field:calendar.attendee,event_date:0 +#: view:calendar.event:0 +msgid "Event Date" +msgstr "Datum događaja" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Group By..." +msgstr "Grupirano po" + +#. module: base_calendar +#: help:calendar.attendee,partner_id:0 +msgid "Partner related to contact" +msgstr "Partner povezan s kontaktom" + +#. module: base_calendar +#: help:calendar.attendee,cutype:0 +msgid "Specify the type of Invitation" +msgstr "Odredite tip poziva" + +#. module: base_calendar +#: help:calendar.event,exrule:0 +#: help:calendar.todo,exrule:0 +msgid "" +"defines a rule or repeating pattern for an exception to a recurrence set" +msgstr "" +"Definise pravilo ili ponavljajući uzorak za eksepciju u skupu ponavljanja" + +#. module: base_calendar +#: field:calendar.alarm,event_end_date:0 +#: field:calendar.attendee,event_end_date:0 +msgid "Event End Date" +msgstr "Datum završetka događaja" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Optional Participation" +msgstr "Neobvezno sudelovanje" + +#. module: base_calendar +#: field:calendar.event,date_deadline:0 +#: field:calendar.todo,date_deadline:0 +msgid "Deadline" +msgstr "Krajnji Rok" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:0 +#, python-format +msgid "Warning!" +msgstr "Upozorenje!" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "_Cancel" +msgstr "_Odustani" + +#. module: base_calendar +#: model:ir.module.module,shortdesc:base_calendar.module_meta_information +msgid "Basic Calendar Functionality" +msgstr "Osnovna funkcionalnost kalendara" + +#. module: base_calendar +#: field:calendar.event,organizer:0 +#: field:calendar.event,organizer_id:0 +#: field:calendar.todo,organizer:0 +#: field:calendar.todo,organizer_id:0 +msgid "Organizer" +msgstr "Organizator" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:0 +#: view:calendar.event:0 +#: model:res.request.link,name:base_calendar.request_link_meeting +#, python-format +msgid "Event" +msgstr "Događaj" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_occurs:0 +#: selection:res.alarm,trigger_occurs:0 +msgid "Before" +msgstr "Pre" + +#. module: base_calendar +#: view:calendar.event:0 +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Confirmed" +msgstr "Potvrđeno" + +#. module: base_calendar +#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all +msgid "Edit all events" +msgstr "Uredi sve događaje" + +#. module: base_calendar +#: field:calendar.alarm,attendee_ids:0 +#: field:calendar.event,attendee_ids:0 +#: field:calendar.todo,attendee_ids:0 +msgid "Attendees" +msgstr "Učesnici" + +#. module: base_calendar +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Pogrešno ime modela u definiciji akcije." + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Confirm" +msgstr "Potvrdi" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_todo +msgid "Calendar Task" +msgstr "Zadatak po Kalendaru" + +#. module: base_calendar +#: field:base.calendar.set.exrule,su:0 +#: field:calendar.event,su:0 +#: field:calendar.todo,su:0 +msgid "Sun" +msgstr "Nedelja" + +#. module: base_calendar +#: field:calendar.attendee,cutype:0 +msgid "Invite Type" +msgstr "Tip poziva" + +#. module: base_calendar +#: view:res.alarm:0 +msgid "Reminder details" +msgstr "Detalji podsetnika" + +#. module: base_calendar +#: field:calendar.attendee,parent_ids:0 +msgid "Delegrated From" +msgstr "Delegirano od" + +#. 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 "Dan u mesecu" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event,location:0 +#: field:calendar.event.edit.all,location:0 +#: field:calendar.todo,location:0 +msgid "Location" +msgstr "Lokacija" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,send_mail:0 +msgid "Send mail?" +msgstr "Poslati e-poštu?" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,email:0 +#: selection:calendar.alarm,action:0 +#: field:calendar.attendee,email:0 +msgid "Email" +msgstr "E‑pošta" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Event Detail" +msgstr "Detalj događaja" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Run" +msgstr "Izvrši" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_alarm +msgid "Event alarm information" +msgstr "Informacija alarma događaja" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Confidential" +msgstr "Poverljivo" + +#. 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 "Ponavljaj dok" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Visibility" +msgstr "Vidljivost" + +#. module: base_calendar +#: field:calendar.attendee,rsvp:0 +msgid "Required Reply?" +msgstr "Potreban odgovor?" + +#. module: base_calendar +#: field:calendar.event,base_calendar_url:0 +#: field:calendar.todo,base_calendar_url:0 +msgid "Caldav URL" +msgstr "CalDAV URL" + +#. module: base_calendar +#: field:calendar.event,recurrent_uid:0 +#: field:calendar.todo,recurrent_uid:0 +msgid "Recurrent ID" +msgstr "Ponavljajući 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 "Jul" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Accepted" +msgstr "Prihvaćeno" + +#. module: base_calendar +#: field:base.calendar.set.exrule,th:0 +#: field:calendar.event,th:0 +#: field:calendar.todo,th:0 +msgid "Thu" +msgstr "Čet" + +#. module: base_calendar +#: field:calendar.attendee,child_ids:0 +msgid "Delegrated To" +msgstr "Proslijeđeno" + +#. module: base_calendar +#: constraint:ir.cron:0 +msgid "Invalid arguments" +msgstr "Neispravni Argumenti" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Required Reply" +msgstr "Očekivan odgovor" + +#. module: base_calendar +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Nevažeći XML za pregled arhitekture" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "Participation required" +msgstr "Obvezno sudelovanje" + +#. module: base_calendar +#: field:calendar.event,create_date:0 +#: field:calendar.todo,create_date:0 +msgid "Created" +msgstr "Kreirano" + +#. module: base_calendar +#: selection:calendar.event,class:0 +#: selection:calendar.todo,class:0 +msgid "Private" +msgstr "Privatno" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,freq:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Daily" +msgstr "Dnevno" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:0 +#, python-format +msgid "Can not Duplicate" +msgstr "Ne može se kopirati" + +#. module: base_calendar +#: field:calendar.event,class:0 +#: field:calendar.todo,class:0 +msgid "Mark as" +msgstr "Označi kao" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,partner_address_id:0 +msgid "Contact" +msgstr "Kontakt" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Delegate" +msgstr "Delegiraj" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,partner_id:0 +#: view:calendar.attendee:0 +#: field:calendar.attendee,partner_id:0 +msgid "Partner" +msgstr "Partner" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "Select data for ExRule" +msgstr "Odaberi podatke za pravilo iznimke" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: selection:base_calendar.invite.attendee,type:0 +msgid "Partner Contacts" +msgstr "Kontakti partnera" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "_Ok" +msgstr "_U Redu" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "First" +msgstr "Prvi" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Privacy" +msgstr "Privatnost" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Subject" +msgstr "Tema" + +#. 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 "Septembar" + +#. 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 "Decembar" + +#. 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 "Označite ako želite poslati e-poštu pozvanoj osobi" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Availability" +msgstr "Dostupnost" + +#. module: base_calendar +#: view:calendar.event.edit.all:0 +msgid "_Save" +msgstr "_Sačuvaj" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Individual" +msgstr "Individualno" + +#. module: base_calendar +#: field:calendar.alarm,user_id:0 +msgid "Owner" +msgstr "Vlasnik" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Delegation Info" +msgstr "Detalji prosleđivanja" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,date:0 +msgid "Start Date" +msgstr "Početni datum" + +#. module: base_calendar +#: field:calendar.attendee,cn:0 +msgid "Common name" +msgstr "Uobičajeno ime" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Declined" +msgstr "Odbijeno" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "My Role" +msgstr "Moja Uloga" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "My Events" +msgstr "Moji Dogadjaji" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Decline" +msgstr "Odbij" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Group" +msgstr "Grupa" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Edit All" +msgstr "Uredi Sve" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,contact_ids:0 +msgid "Contacts" +msgstr "Kontakti" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_res_alarm +msgid "Basic Alarm Information" +msgstr "Osnovni podaci alarma" + +#. module: base_calendar +#: field:base.calendar.set.exrule,fr:0 +#: field:calendar.event,fr:0 +#: field:calendar.todo,fr:0 +msgid "Fri" +msgstr "Petak" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Invitation Detail" +msgstr "Detalji Poziva" + +#. module: base_calendar +#: field:calendar.attendee,member:0 +msgid "Member" +msgstr "Član" + +#. module: base_calendar +#: help:calendar.event,location:0 +#: help:calendar.todo,location:0 +msgid "Location of Event" +msgstr "Lokacija Dogadjaja" + +#. module: base_calendar +#: field:calendar.event,rrule:0 +#: field:calendar.todo,rrule:0 +msgid "Recurrent Rule" +msgstr "Ponavljajuće pravilo" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Draft" +msgstr "Priprema" + +#. module: base_calendar +#: field:calendar.alarm,attach:0 +msgid "Attachment" +msgstr "Dodatak" + +#. module: base_calendar +#: constraint:ir.ui.menu:0 +msgid "Error ! You can not create recursive Menu." +msgstr "Greska! Ne mozete kreirati rekursivni meni." + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation From" +msgstr "Poziv Od" + +#. module: base_calendar +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,alarm_id:0 +msgid "Reminder" +msgstr "Podsetnik" + +#. 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 "Postavi pravilo izuzetka" + +#. 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 "Događaji" + +#. 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 "Pozovi ucesnike" + +#. module: base_calendar +#: help:calendar.attendee,email:0 +msgid "Email of Invited Person" +msgstr "Email pozvane Osobe" + +#. module: base_calendar +#: field:calendar.alarm,repeat:0 +#: field:res.alarm,repeat:0 +msgid "Repeat" +msgstr "Ponovi" + +#. module: base_calendar +#: help:calendar.attendee,dir:0 +msgid "" +"Reference to the URIthat points to the directory information corresponding " +"to the attendee." +msgstr "Napomena za URL koji pokazuje na podatke direktorijuma ucesnika" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,month_list:0 +#: selection:calendar.event,month_list:0 +#: selection:calendar.todo,month_list:0 +msgid "August" +msgstr "Avgust" + +#. 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 "Ponedeljak" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Third" +msgstr "Treći" + +#. 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 "Jun" + +#. module: base_calendar +#: field:calendar.alarm,alarm_id:0 +msgid "Basic Alarm" +msgstr "Osnovni alarmDelegirano od" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +#: view:calendar.event:0 +msgid "The" +msgstr "" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,delegated_from:0 +msgid "Delegated From" +msgstr "Delegirano Od" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: field:calendar.attendee,user_id:0 +msgid "User" +msgstr "Korisnik" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "ExRule" +msgstr "Pravilo Izuzetka" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event,date:0 +msgid "Date" +msgstr "Datum" + +#. 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 "Novembar" + +#. module: base_calendar +#: help:calendar.attendee,member:0 +msgid "Indicate the groups that the attendee belongs to" +msgstr "Označite grupe kojima ucesnik pripada" + +#. module: base_calendar +#: field:base.calendar.set.exrule,mo:0 +#: field:calendar.event,mo:0 +#: field:calendar.todo,mo:0 +msgid "Mon" +msgstr "Pon" + +#. module: base_calendar +#: field:base.calendar.set.exrule,count:0 +#: field:calendar.event,count:0 +#: field:calendar.todo,count:0 +msgid "Count" +msgstr "Brojanje" + +#. 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 "Oktobar" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Uncertain" +msgstr "Nesigurno" + +#. module: base_calendar +#: field:calendar.attendee,language:0 +msgid "Language" +msgstr "Jezik" + +#. module: base_calendar +#: field:calendar.alarm,trigger_occurs:0 +#: field:res.alarm,trigger_occurs:0 +msgid "Triggers" +msgstr "Okidači" + +#. 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 "Januar" + +#. module: base_calendar +#: field:calendar.alarm,trigger_related:0 +#: field:res.alarm,trigger_related:0 +msgid "Related to" +msgstr "Povezano sa" + +#. module: base_calendar +#: field:base.calendar.set.exrule,interval:0 +#: field:calendar.alarm,trigger_interval:0 +#: field:calendar.event,interval:0 +#: field:calendar.todo,interval:0 +#: field:res.alarm,trigger_interval:0 +msgid "Interval" +msgstr "Interval" + +#. 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 "Sreda" + +#. module: base_calendar +#: field:calendar.alarm,name:0 +#: view:calendar.event:0 +msgid "Summary" +msgstr "Sumarno" + +#. module: base_calendar +#: field:calendar.alarm,active:0 +#: field:calendar.event,active:0 +#: field:calendar.todo,active:0 +#: field:res.alarm,active:0 +msgid "Active" +msgstr "Aktivan" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation" +msgstr "Pozivnica" + +#. module: base_calendar +#: field:calendar.alarm,action:0 +msgid "Action" +msgstr "Radnja" + +#. module: base_calendar +#: help:calendar.alarm,duration:0 +#: help:res.alarm,duration:0 +msgid "" +"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the " +"other" +msgstr "" +"'Trajanje' i 'Ponavljanje' su neobvezni, ali ako se jedan dogodi, MORA se " +"dogoditi i drugi" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_event_edit_all +msgid "Calendar Edit all event" +msgstr "" + +#. module: base_calendar +#: help:calendar.attendee,role:0 +msgid "Participation role for the calendar user" +msgstr "Uredi Sve dogadjaje Kalendara" + +#. module: base_calendar +#: field:calendar.attendee,ref:0 +msgid "Event Ref" +msgstr "Referentni Dogadjaj" + +#. module: base_calendar +#: help:calendar.alarm,action:0 +msgid "Defines the action to be invoked when an alarm is triggered" +msgstr "Određuje akciju koja će se pokrenuti kada se okine alarm" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Search Events" +msgstr "Pretraži događaje" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,freq:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Weekly" +msgstr "Sedmično" + +#. module: base_calendar +#: help:calendar.alarm,active:0 +#: help:calendar.event,active:0 +#: help:calendar.todo,active:0 +#: help:res.alarm,active:0 +msgid "" +"If the active field is set to true, it will allow you to hide the event " +"alarm information without removing it." +msgstr "" +"ko je aktivan, omogućeno je skrivanje detalja alarma događaja bez uklanjanja " +"istog" + +#. module: base_calendar +#: field:calendar.event,recurrent_id:0 +#: field:calendar.todo,recurrent_id:0 +msgid "Recurrent ID date" +msgstr "Ponavljajući ID datuma" + +#. module: base_calendar +#: field:calendar.alarm,state:0 +#: view:calendar.attendee:0 +#: field:calendar.attendee,state:0 +#: view:calendar.event:0 +#: field:calendar.event,state:0 +#: field:calendar.todo,state:0 +msgid "State" +msgstr "Stanje" + +#. module: base_calendar +#: view:res.alarm:0 +msgid "Reminder Details" +msgstr "Detalji podsetnika" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "To Review" +msgstr "Pregledati" + +#. module: base_calendar +#: field:base.calendar.set.exrule,freq:0 +#: field:calendar.event,freq:0 +#: field:calendar.todo,freq:0 +msgid "Frequency" +msgstr "Frekvencija" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Done" +msgstr "Gotovo" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: field:base_calendar.invite.attendee,user_ids:0 +msgid "Users" +msgstr "Korisnici" + +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +#: view:calendar.event:0 +msgid "of" +msgstr "od" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: view:calendar.event:0 +#: view:calendar.event.edit.all:0 +msgid "Cancel" +msgstr "Otkaži" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_res_users +msgid "res.users" +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 "Utorak" + +#. module: base_calendar +#: help:calendar.alarm,description:0 +msgid "" +"Provides a more complete description of the " +"calendar component, than that provided by the " +"\"SUMMARY\" property" +msgstr "" +"Omogućuje detaljniji opis komponente kalendara, nego oni detalji koji su " +"dati u \"Sumarno\"" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Responsible User" +msgstr "Odgovorni korisnik" + +#. module: base_calendar +#: selection:calendar.attendee,availability:0 +#: selection:calendar.event,show_as:0 +#: selection:calendar.todo,show_as:0 +#: selection:res.users,availability:0 +msgid "Busy" +msgstr "Zauzet" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_event +msgid "Calendar Event" +msgstr "Dogadjaj Kalendara" + +#. module: base_calendar +#: selection:calendar.attendee,state:0 +#: selection:calendar.event,state:0 +#: selection:calendar.todo,state:0 +msgid "Tentative" +msgstr "Uslovno" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event,user_id:0 +#: field:calendar.todo,user_id:0 +msgid "Responsible" +msgstr "Odgovoran" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event,rrule_type:0 +#: field:calendar.todo,rrule_type:0 +msgid "Recurrency" +msgstr "Referenca" + +#. 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 "Pozivnice Dogadjaja" + +#. 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 "Četvrtak" + +#. module: base_calendar +#: selection:calendar.event,rrule_type:0 +#: selection:calendar.todo,rrule_type:0 +msgid "Custom" +msgstr "Prilagodjeno" + +#. module: base_calendar +#: field:calendar.event,exrule:0 +#: field:calendar.todo,exrule:0 +msgid "Exception Rule" +msgstr "Pravilo Izuzetka" + +#. module: base_calendar +#: help:calendar.attendee,language:0 +msgid "" +"To specify the language for text values in aproperty or property parameter." +msgstr "" +"Za određivanje jezika za tekstualne vrednosti u svojstvu ili parametru " +"svojstva" + +#. module: base_calendar +#: view:calendar.event:0 +msgid "Details" +msgstr "Detalji" + +#. 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 "Mesec" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +#: view:calendar.event:0 +msgid "Invite People" +msgstr "Pozovi Ljude" + +#. module: base_calendar +#: help:calendar.event,rrule:0 +#: help:calendar.todo,rrule:0 +msgid "" +"Defines a rule or repeating pattern for recurring events\n" +"e.g.: Every other month on the last Sunday of the month for 10 occurrences: " +" FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU" +msgstr "" +"Određuje o pravilu ponavljajućeg uzorka za ponavljajuće događaje\n" +"npr.: Svaki drugi mesec posljednje nedjelje mjeseca za 10 događaja: " +"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU" + +#. module: base_calendar +#: field:calendar.attendee,dir:0 +msgid "URI Reference" +msgstr "URI napomena" + +#. module: base_calendar +#: field:calendar.alarm,description:0 +#: view:calendar.event:0 +#: field:calendar.event,description:0 +#: field:calendar.event,name:0 +#: field:calendar.todo,description:0 +#: field:calendar.todo,name:0 +msgid "Description" +msgstr "Opis" + +#. 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 "Мај" + +#. module: base_calendar +#: field:base_calendar.invite.attendee,type:0 +#: view:calendar.attendee:0 +msgid "Type" +msgstr "Tip" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Search Invitations" +msgstr "Pretrazi Pozive" + +#. module: base_calendar +#: selection:calendar.alarm,trigger_occurs:0 +#: selection:res.alarm,trigger_occurs:0 +msgid "After" +msgstr "Posle" + +#. module: base_calendar +#: selection:calendar.alarm,state:0 +msgid "Stop" +msgstr "Zaustavi" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_values +msgid "ir.values" +msgstr "ir.values" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_ir_model +msgid "Objects" +msgstr "Objekti" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: selection:calendar.attendee,state:0 +msgid "Delegated" +msgstr "Delegirano" + +#. module: base_calendar +#: field:base.calendar.set.exrule,sa:0 +#: field:calendar.event,sa:0 +#: field:calendar.todo,sa:0 +msgid "Sat" +msgstr "Sub" + +#. module: base_calendar +#: model:ir.module.module,description:base_calendar.module_meta_information +msgid "" +"Full featured calendar system that supports:\n" +" - Calendar of events\n" +" - Alerts (create requests)\n" +" - Recurring events\n" +" - Invitations to people" +msgstr "" +"Potpuni kalendarski sistem koji podržava:\n" +"- Kalendar događaja\n" +"- Alarmi (kreira zahteve)\n" +"- Ponavljajući događaji\n" +"- Pozivi drugima" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,freq:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +msgid "Minutely" +msgstr "U minutama" + +#. module: base_calendar +#: help:calendar.attendee,sent_by:0 +msgid "Specify the user that is acting on behalf of the calendar user" +msgstr "Odredite korisnika koji djeluje u ime korisnika kalendara" + +#. module: base_calendar +#: view:calendar.event:0 +#: field:calendar.event.edit.all,date_deadline:0 +msgid "End Date" +msgstr "Završni Datum" + +#. 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 "Februar" + +#. module: base_calendar +#: selection:calendar.attendee,cutype:0 +msgid "Resource" +msgstr "Resurs" + +#. module: base_calendar +#: field:res.alarm,name:0 +msgid "Name" +msgstr "Ime" + +#. module: base_calendar +#: field:calendar.event,exdate:0 +#: field:calendar.todo,exdate:0 +msgid "Exception Date/Times" +msgstr "Datum/Vreme Izuzetka" + +#. module: base_calendar +#: help:calendar.alarm,name:0 +msgid "" +"Contains the text to be used as the message subject for " +"email or contains the text to be used for display" +msgstr "" +"Sadrži tekst koji će se koristiti kao naslov poruke za e-poštu ili sadrži " +"tekst koji će se koristiti za prikaz" + +#. module: base_calendar +#: field:calendar.event,alarm_id:0 +#: field:calendar.event,base_calendar_alarm_id:0 +#: field:calendar.todo,alarm_id:0 +#: field:calendar.todo,base_calendar_alarm_id:0 +msgid "Alarm" +msgstr "Alarm" + +#. module: base_calendar +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 +#, python-format +msgid "Please Apply Recurrency before applying Exception Rule." +msgstr "Molimo odredite ponavljanje prije postavljanja pravila izuzetaka" + +#. module: base_calendar +#: field:calendar.attendee,sent_by_uid:0 +msgid "Sent By User" +msgstr "poslato od Korisnika" + +#. 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 "April" + +#. 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 "Sedmicni Dan" + +#. module: base_calendar +#: field:base.calendar.set.exrule,byday:0 +#: field:calendar.event,byday:0 +#: field:calendar.todo,byday:0 +msgid "By day" +msgstr "po Danu" + +#. module: base_calendar +#: field:calendar.alarm,model_id:0 +msgid "Model" +msgstr "Model" + +#. module: base_calendar +#: selection:calendar.alarm,action:0 +msgid "Audio" +msgstr "Audio" + +#. module: base_calendar +#: field:calendar.event,id:0 +#: field:calendar.todo,id:0 +msgid "ID" +msgstr "ID" + +#. module: base_calendar +#: selection:calendar.attendee,role:0 +msgid "For information Purpose" +msgstr "Za potrebe informisanja" + +#. module: base_calendar +#: view:base_calendar.invite.attendee:0 +msgid "Invite" +msgstr "Pozovi" + +#. module: base_calendar +#: model:ir.model,name:base_calendar.model_calendar_attendee +msgid "Attendee information" +msgstr "Detalji ucesnika" + +#. module: base_calendar +#: field:calendar.alarm,res_id:0 +msgid "Resource ID" +msgstr "Šifra resursa" + +#. module: base_calendar +#: selection:calendar.attendee,state:0 +msgid "Needs Action" +msgstr "Potrebna akcija" + +#. module: base_calendar +#: field:calendar.attendee,sent_by:0 +msgid "Sent By" +msgstr "Poslato Od" + +#. module: base_calendar +#: field:calendar.event,sequence:0 +#: field:calendar.todo,sequence:0 +msgid "Sequence" +msgstr "Sekvenca" + +#. module: base_calendar +#: field:calendar.event,vtimezone:0 +#: field:calendar.todo,vtimezone:0 +msgid "Timezone" +msgstr "Vremenska zona" + +#. module: base_calendar +#: selection:base_calendar.invite.attendee,type:0 +msgid "Internal User" +msgstr "Interni Korisnik" + +#. module: base_calendar +#: view:calendar.attendee:0 +#: view:calendar.event:0 +msgid "Accept" +msgstr "Prihvati" + +#. 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 "Subota" + +#. module: base_calendar +#: view:calendar.attendee:0 +msgid "Invitation To" +msgstr "Poziv za" + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Second" +msgstr "Drugi" + +#. module: base_calendar +#: field:calendar.attendee,availability:0 +#: field:res.users,availability:0 +msgid "Free/Busy" +msgstr "Slobodno/Zauzeto" + +#. module: base_calendar +#: field:calendar.alarm,duration:0 +#: field:calendar.alarm,trigger_duration:0 +#: field:calendar.event,duration:0 +#: field:calendar.todo,date:0 +#: field:calendar.todo,duration:0 +#: field:res.alarm,duration:0 +#: field:res.alarm,trigger_duration:0 +msgid "Duration" +msgstr "Trajanje" + +#. module: base_calendar +#: selection:base_calendar.invite.attendee,type:0 +msgid "External Email" +msgstr "Spoljni Email" + +#. module: base_calendar +#: field:calendar.alarm,trigger_date:0 +msgid "Trigger Date" +msgstr "Datum okidanja" + +#. module: base_calendar +#: help:calendar.alarm,attach:0 +msgid "" +"* Points to a sound resource, which is rendered when the " +"alarm is triggered for audio,\n" +" * File which is intended to be sent as message " +"attachments for email,\n" +" * Points to a procedure resource, which is invoked when " +" the alarm is triggered for procedure." +msgstr "" +"* Pokazuje na datoteku sa zvukom, koji se pojavljuje kada se pokrene alarm,\n" +"* Na datoteku koja se treba poslati kao dodatak e-pošte,\n" +"* Na proceduru koja se pokreće kada se pokrene alarm za proceduru." + +#. module: base_calendar +#: selection:base.calendar.set.exrule,byday:0 +#: selection:calendar.event,byday:0 +#: selection:calendar.todo,byday:0 +msgid "Fifth" +msgstr "Peti" diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv index 0ae628fb720..aa269e9ff18 100644 --- a/addons/base_calendar/security/ir.model.access.csv +++ b/addons/base_calendar/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,0 +"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1 "access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1 "access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1 "access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1 diff --git a/addons/base_contact/i18n/sr.po b/addons/base_contact/i18n/sr.po index 9a3fb65353b..b8dc4170bdf 100644 --- a/addons/base_contact/i18n/sr.po +++ b/addons/base_contact/i18n/sr.po @@ -8,35 +8,36 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-21 12:30+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-10-16 09:28+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact #: field:res.partner.job,sequence_contact:0 msgid "Contact Seq." -msgstr "" +msgstr "Seq. Osobe" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_contact msgid "res.partner.contact" -msgstr "" +msgstr "es.partner.contact" #. module: base_contact #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" #. module: base_contact #: field:res.partner.job,function_id:0 msgid "Partner Function" -msgstr "" +msgstr "Funkcija Partnera" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form @@ -46,97 +47,97 @@ msgstr "" #: view:res.partner.address:0 #: field:res.partner.address,job_ids:0 msgid "Contacts" -msgstr "" +msgstr "Kontakti" #. module: base_contact #: field:res.partner.job,sequence_partner:0 msgid "Partner Seq." -msgstr "" +msgstr "Partner Seq." #. module: base_contact #: selection:res.partner.job,state:0 msgid "Current" -msgstr "" +msgstr "Trenutni" #. module: base_contact #: field:res.partner.contact,first_name:0 msgid "First Name" -msgstr "" +msgstr "Ime" #. module: base_contact #: model:ir.model,name:base_contact.model_res_partner_job msgid "Contact Partner Function" -msgstr "" +msgstr "Funkcija Kontakta Partnera" #. module: base_contact #: field:res.partner.job,other:0 msgid "Other" -msgstr "" +msgstr "Drugo" #. module: base_contact #: model:process.transition,name:base_contact.process_transition_contacttofunction0 msgid "Contact to function" -msgstr "" +msgstr "Kontakt na funkciju" #. module: base_contact #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Pogrešno ime modela u definiciji akcije." #. module: base_contact #: model:process.transition,name:base_contact.process_transition_partnertoaddress0 msgid "Partner to address" -msgstr "" +msgstr "Partner na adresu" #. module: base_contact #: view:res.partner.address:0 msgid "# of Contacts" -msgstr "" +msgstr "# Kontakata" #. module: base_contact #: help:res.partner.job,other:0 msgid "Additional phone field" -msgstr "" +msgstr "Dodatno polje za Tel" #. module: base_contact #: model:process.node,name:base_contact.process_node_function0 msgid "Function" -msgstr "" +msgstr "Funkcija" #. module: base_contact #: field:res.partner.job,fax:0 msgid "Fax" -msgstr "" +msgstr "Faks" #. module: base_contact #: field:res.partner.contact,lang_id:0 msgid "Language" -msgstr "" +msgstr "Jezik" #. module: base_contact #: field:res.partner.job,phone:0 msgid "Phone" -msgstr "" +msgstr "Telefon" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_contacttofunction0 msgid "Defines contacts and functions." -msgstr "" +msgstr "Određuje Osobe i Funkcije" #. module: base_contact #: field:res.partner.contact,title:0 msgid "Title" -msgstr "" +msgstr "Naslov" #. module: base_contact #: view:res.partner.job:0 msgid "Contact Functions" -msgstr "" +msgstr "Funkcije Osoba" #. module: base_contact #: model:ir.module.module,shortdesc:base_contact.module_meta_information msgid "Base Contact" -msgstr "" +msgstr "Osnovni Kontakt" #. module: base_contact #: help:res.partner.job,sequence_partner:0 @@ -144,212 +145,214 @@ msgid "" "Order of importance of this job title in the list of job title of the linked " "partner" msgstr "" +"redosled važnosti ovog naziva Posla-Radnog mesta u listi naziva Poslova-" +"Radnih mesta povezanog Partnera" #. module: base_contact #: field:res.partner.contact,email:0 #: field:res.partner.job,email:0 msgid "E-Mail" -msgstr "" +msgstr "E-Mail" #. module: base_contact #: field:res.partner.job,date_stop:0 msgid "Date Stop" -msgstr "" +msgstr "Datum Završetka" #. module: base_contact #: view:res.partner:0 #: field:res.partner.job,address_id:0 msgid "Address" -msgstr "" +msgstr "Adresa" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.action_res_partner_job #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job msgid "Contact's Jobs" -msgstr "" +msgstr "Poslovi kontakta" #. module: base_contact #: field:res.partner.contact,country_id:0 msgid "Nationality" -msgstr "" +msgstr "Nacionalnost" #. module: base_contact #: help:res.partner.job,sequence_contact:0 msgid "" "Order of importance of this address in the list of addresses of the linked " "contact" -msgstr "" +msgstr "redosled važnosti ove Adrese u listi Adresa povezanog Partnera" #. module: base_contact #: field:res.partner.address,job_id:0 #: field:res.partner.contact,job_id:0 msgid "Main Job" -msgstr "" +msgstr "Glavni Posao" #. module: base_contact #: view:res.partner:0 msgid "Categories" -msgstr "" +msgstr "Kategorije" #. module: base_contact #: field:res.partner.contact,function_id:0 msgid "Main Function" -msgstr "" +msgstr "Glavna Funkcija" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_partnertoaddress0 msgid "Define partners and their addresses." -msgstr "" +msgstr "Definisi Partnere i njihove Adrese" #. module: base_contact #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Nevažeći XML za pregled arhitekture" #. module: base_contact #: model:process.process,name:base_contact.process_process_basecontactprocess0 msgid "Base Contact Process" -msgstr "" +msgstr "Postupak Osnovnog Kontakta" #. module: base_contact #: view:res.partner.contact:0 msgid "Seq." -msgstr "" +msgstr "Sekv." #. module: base_contact #: field:res.partner.job,extension:0 msgid "Extension" -msgstr "" +msgstr "Dodatak" #. module: base_contact #: field:res.partner.contact,mobile:0 msgid "Mobile" -msgstr "" +msgstr "Mobilni" #. module: base_contact #: help:res.partner.job,extension:0 msgid "Internal/External extension phone number" -msgstr "" +msgstr "Interna/Externa Ekstenzija Tel. broja" #. module: base_contact #: model:process.node,note:base_contact.process_node_contacts0 msgid "People you work with." -msgstr "" +msgstr "Ljudi s kojima radite." #. module: base_contact #: view:res.partner.contact:0 msgid "Extra Information" -msgstr "" +msgstr "Dodatne informacije" #. module: base_contact #: view:res.partner.contact:0 #: field:res.partner.contact,job_ids:0 msgid "Functions and Addresses" -msgstr "" +msgstr "Funkcije i Adrese" #. module: base_contact #: field:res.partner.contact,active:0 msgid "Active" -msgstr "" +msgstr "Aktivan" #. module: base_contact #: field:res.partner.job,contact_id:0 msgid "Contact" -msgstr "" +msgstr "Kontakt" #. module: base_contact #: model:process.node,note:base_contact.process_node_partners0 msgid "Companies you work with." -msgstr "" +msgstr "Kompanije s kojima radite." #. module: base_contact #: field:res.partner.contact,partner_id:0 msgid "Main Employer" -msgstr "" +msgstr "Glavni Poslodavac." #. module: base_contact #: model:process.transition,name:base_contact.process_transition_functiontoaddress0 msgid "Function to address" -msgstr "" +msgstr "Funkcija na Adresu" #. module: base_contact #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs msgid "Partner Contacts" -msgstr "" +msgstr "Kontakti partnera" #. module: base_contact #: view:res.partner.contact:0 msgid "Partner Contact" -msgstr "" +msgstr "Kontakt partnera" #. module: base_contact #: model:process.node,name:base_contact.process_node_partners0 msgid "Partners" -msgstr "" +msgstr "Partneri" #. module: base_contact #: model:process.node,name:base_contact.process_node_addresses0 #: view:res.partner:0 msgid "Addresses" -msgstr "" +msgstr "Adrese" #. module: base_contact #: model:process.node,note:base_contact.process_node_addresses0 msgid "Working and private addresses." -msgstr "" +msgstr "Rad na Privatnoj adresi" #. module: base_contact #: field:res.partner.contact,name:0 msgid "Last Name" -msgstr "" +msgstr "Prezime" #. module: base_contact #: field:res.partner.job,state:0 msgid "State" -msgstr "" +msgstr "Stanje" #. module: base_contact #: view:res.partner.contact:0 #: view:res.partner.job:0 msgid "General" -msgstr "" +msgstr "Opšte" #. module: base_contact #: selection:res.partner.job,state:0 msgid "Past" -msgstr "" +msgstr "Prošlost" #. module: base_contact #: view:res.partner.contact:0 msgid "General Information" -msgstr "" +msgstr "Opšte informacije" #. module: base_contact #: model:process.node,note:base_contact.process_node_function0 msgid "Jobs at a same partner address." -msgstr "" +msgstr "Poslovi na istoj Adresi Partnera" #. module: base_contact #: field:res.partner.job,name:0 msgid "Partner" -msgstr "" +msgstr "Partner" #. module: base_contact #: field:res.partner.job,date_start:0 msgid "Date Start" -msgstr "" +msgstr "Početni datum" #. module: base_contact #: model:process.transition,note:base_contact.process_transition_functiontoaddress0 msgid "Define functions and address." -msgstr "" +msgstr "Definisi Funkcije i Adrese" #. module: base_contact #: field:res.partner.contact,website:0 msgid "Website" -msgstr "" +msgstr "Internet stranica" #. module: base_contact #: field:res.partner.contact,birthdate:0 msgid "Birth Date" -msgstr "" +msgstr "Datum rođenja" diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po index 23ba5329fd3..cd0a36c5208 100644 --- a/addons/base_iban/i18n/sr.po +++ b/addons/base_iban/i18n/sr.po @@ -8,57 +8,57 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-21 12:29+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-10-16 09:02+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 04:52+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_iban #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Nevažeći XML za pregled arhitekture" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field msgid "zip" -msgstr "" +msgstr "Pošt. Broj" #. module: base_iban #: help:res.partner.bank,iban:0 msgid "International Bank Account Number" -msgstr "" +msgstr "Međunarodni broj Bankovnog računa" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_country_field msgid "country_id" -msgstr "" +msgstr "country_id" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field msgid "bic" -msgstr "" +msgstr "bic" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field msgid "iban" -msgstr "" +msgstr "iban" #. module: base_iban #: model:ir.module.module,shortdesc:base_iban.module_meta_information #: field:res.partner.bank,iban:0 msgid "IBAN" -msgstr "" +msgstr "IBAN" #. module: base_iban #: model:res.partner.bank.type,name:base_iban.bank_iban msgid "IBAN Account" -msgstr "" +msgstr "IBAN konto" #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field msgid "acc_number" -msgstr "" +msgstr "Broj konta" diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po index 6f151909339..64844aac820 100644 --- a/addons/base_module_quality/i18n/it.po +++ b/addons/base_module_quality/i18n/it.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 11:04+0000\n" +"PO-Revision-Date: 2010-10-17 07:55+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 04:56+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality @@ -38,7 +38,7 @@ msgstr "Modulo base di qualità" #. module: base_module_quality #: field:module.quality.check,name:0 msgid "Rated Module" -msgstr "" +msgstr "Valuta Modulo" #. module: base_module_quality #: view:module.quality.detail:0 diff --git a/addons/base_module_quality/i18n/sr.po b/addons/base_module_quality/i18n/sr.po index 083bd2bfafd..83992eb2640 100644 --- a/addons/base_module_quality/i18n/sr.po +++ b/addons/base_module_quality/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 15:37+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-16 11:23+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality @@ -138,32 +138,32 @@ msgstr "Sumarno" #. module: base_module_quality #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save msgid "Report Save" -msgstr "" +msgstr "Sacuvaj Izvestaj" #. module: base_module_quality #: wizard_view:quality_detail_save,init:0 msgid "Standard entries" -msgstr "" +msgstr "Standardne stavke" #. module: base_module_quality #: view:module.quality.detail:0 msgid "Save Report" -msgstr "" +msgstr "Sacuvaj Izvestaj" #. module: base_module_quality #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id msgid "Quality Check" -msgstr "" +msgstr "Provera Kvaliteta" #. module: base_module_quality #: model:ir.model,name:base_module_quality.model_module_quality_detail msgid "module.quality.detail" -msgstr "" +msgstr "modul.detalj.kvalitet" #. module: base_module_quality #: selection:module.quality.detail,state:0 msgid "Done" -msgstr "" +msgstr "Gotovo" #. module: base_module_quality #: view:module.quality.check:0 @@ -174,12 +174,12 @@ msgstr "Rezultat" #. module: base_module_quality #: wizard_button:quality_detail_save,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Otkaži" #. module: base_module_quality #: field:module.quality.detail,message:0 msgid "Message" -msgstr "" +msgstr "Poruka" #. module: base_module_quality #: field:module.quality.detail,quality_check_id:0 diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po index 65d7ba6bb4f..40a3beef7c4 100644 --- a/addons/base_module_record/i18n/sr.po +++ b/addons/base_module_record/i18n/sr.po @@ -8,99 +8,100 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-21 12:24+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-10-16 10:25+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,category:0 #: wizard_field:base_module_record.module_save,info,category:0 msgid "Category" -msgstr "" +msgstr "Категорија" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 #: wizard_field:base_module_record.module_save,init,info_text:0 #: wizard_view:base_module_record.module_save,save:0 msgid "Information" -msgstr "" +msgstr "Informacija" #. module: base_module_record #: model:ir.model,name:base_module_record.model_ir_module_record msgid "ir.module.record" -msgstr "" +msgstr "ir.module.record" #. module: base_module_record #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,init:0 msgid "Choose objects to record" -msgstr "" +msgstr "Izaberi objekat za cuvanje" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,author:0 #: wizard_field:base_module_record.module_save,info,author:0 msgid "Author" -msgstr "" +msgstr "Autor" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,directory_name:0 #: wizard_field:base_module_record.module_save,info,directory_name:0 msgid "Directory Name" -msgstr "" +msgstr "Ime Direktorijuma" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0 msgid "Records only" -msgstr "" +msgstr "Samo Zapisi" #. module: base_module_record #: selection:base_module_record.module_record_objects,intro,data_kind:0 #: selection:base_module_record.module_save,info,data_kind:0 msgid "Demo Data" -msgstr "" +msgstr "Demo Podaci" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,save,module_filename:0 #: wizard_field:base_module_record.module_save,save,module_filename:0 msgid "Filename" -msgstr "" +msgstr "Ime Fajla" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,version:0 #: wizard_field:base_module_record.module_save,info,version:0 msgid "Version" -msgstr "" +msgstr "Verzija" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,init:0 msgid "Objects Recording" -msgstr "" +msgstr "Objekti se Snimaju" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,init,check_date:0 msgid "Record from Date" -msgstr "" +msgstr "Zapis od Datuma" #. module: base_module_record #: wizard_view:base_module_record.module_record,stop:0 #: wizard_view:base_module_record.module_save,init:0 msgid "Recording Information" -msgstr "" +msgstr "Informacija o Snimanju" #. module: base_module_record #: wizard_field:base_module_record.module_save,init,info_status:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: base_module_record #: wizard_view:base_module_record.module_record,stop:0 @@ -112,111 +113,111 @@ msgstr "" #: wizard_view:base_module_record.module_save,init:0 #: wizard_view:base_module_record.module_save,save:0 msgid "Module Recording" -msgstr "" +msgstr "Snimanje Modula" #. module: base_module_record #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects msgid "Export Customizations As a Module" -msgstr "" +msgstr "Izvezi Podesavanja kao Modul" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 #: wizard_view:base_module_record.module_save,save:0 msgid "Thanks in advance for your contribution." -msgstr "" +msgstr "Hvala unaprijed na Vašem Doprinosu" #. module: base_module_record #: help:base_module_record.module_record_objects,init,objects:0 msgid "List of objects to be recorded" -msgstr "" +msgstr "Lista Objekata za zapis" #. module: base_module_record #: wizard_button:base_module_record.module_record,start,start_confirm:0 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record msgid "Start Recording" -msgstr "" +msgstr "Počni Snimanje" #. module: base_module_record #: selection:base_module_record.module_save,init,info_status:0 msgid "Not Recording" -msgstr "" +msgstr "Ne Snima" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,description:0 #: wizard_field:base_module_record.module_save,info,description:0 msgid "Full Description" -msgstr "" +msgstr "Puni Opis" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,name:0 #: wizard_field:base_module_record.module_save,info,name:0 msgid "Module Name" -msgstr "" +msgstr "Naziv Modula" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,init,objects:0 msgid "Objects" -msgstr "" +msgstr "Objekti" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,save,module_file:0 #: wizard_field:base_module_record.module_save,save,module_file:0 msgid "Module .zip File" -msgstr "" +msgstr ".zip datoteka Modula" #. module: base_module_record #: wizard_view:base_module_record.module_record,start:0 msgid "Recording information" -msgstr "" +msgstr "Informacija o Snimanju" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 #: wizard_view:base_module_record.module_save,save:0 msgid "Module successfully created !" -msgstr "" +msgstr "Modul uspješno kreiran !" #. module: base_module_record #: wizard_view:base_module_record.module_record,start:0 msgid "Recording Stopped" -msgstr "" +msgstr "Snimanje zaustavljeno" #. module: base_module_record #: selection:base_module_record.module_record_objects,init,filter_cond:0 msgid "Created" -msgstr "" +msgstr "Kreirano" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,end:0 #: wizard_view:base_module_record.module_save,end:0 msgid "Thanks For using Module Recorder" -msgstr "" +msgstr "Hvala što ste koristili Snimač Modula" #. module: base_module_record #: wizard_field:base_module_record.module_record,start,continue:0 msgid "Continue Previous Session" -msgstr "" +msgstr "Nastavi Prethodnu Sesiju" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,website:0 #: wizard_field:base_module_record.module_save,info,website:0 msgid "Documentation URL" -msgstr "" +msgstr "URL Dokumentacije" #. module: base_module_record #: selection:base_module_record.module_record_objects,init,filter_cond:0 msgid "Modified" -msgstr "" +msgstr "Izmenjen" #. module: base_module_record #: selection:base_module_record.module_save,init,info_status:0 msgid "Recording" -msgstr "" +msgstr "Snimanje" #. module: base_module_record #: wizard_button:base_module_record.module_record_objects,init,record:0 msgid "Record" -msgstr "" +msgstr "Snima" #. module: base_module_record #: wizard_button:base_module_record.module_record,stop,end:0 @@ -224,25 +225,25 @@ msgstr "" #: wizard_button:base_module_record.module_save,info,save:0 #: wizard_button:base_module_record.module_save,init,check:0 msgid "Continue" -msgstr "" +msgstr "Nastavi" #. module: base_module_record #: model:ir.module.module,shortdesc:base_module_record.module_meta_information #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec msgid "Module Recorder" -msgstr "" +msgstr "Snimač Modula" #. module: base_module_record #: selection:base_module_record.module_record_objects,intro,data_kind:0 #: selection:base_module_record.module_save,info,data_kind:0 msgid "Normal Data" -msgstr "" +msgstr "Obični podaci" #. module: base_module_record #: wizard_button:base_module_record.module_record_objects,end,end:0 #: wizard_button:base_module_record.module_save,end,end:0 msgid "OK" -msgstr "" +msgstr "U redu" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,save:0 @@ -252,6 +253,9 @@ msgid "" "publish it on OpenERP.com, in the 'Modules' section. You can do it through " "the website or using features of the 'base_module_publish' module." msgstr "" +"Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga " +"publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili " +"korištenjem mogućnosti Modula: 'base_module_publish'." #. module: base_module_record #: wizard_view:base_module_record.module_record,start:0 @@ -260,16 +264,19 @@ msgid "" "ERP client and save them as a module. You will be able to install this " "module on any database to reuse and/or publish it." msgstr "" +"Snimač Modula omogućuje Vam da snimite svaku operaciju izvršenu u Open ERP " +"klijentu i izmjene spremite kao Modul. Moći ćete instalirati taj Modul na " +"bilo kojoj Bazi Podataka za ponovnu upotrebu ili publiciranje." #. module: base_module_record #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record msgid "Record module" -msgstr "" +msgstr "Snimi Modul" #. module: base_module_record #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec msgid "Module Creation" -msgstr "" +msgstr "Kreacija Modula" #. module: base_module_record #: wizard_view:base_module_record.module_record,stop:0 @@ -277,30 +284,33 @@ msgid "" "You can continue the recording session by relauching the 'start recording' " "wizard." msgstr "" +"Možete nastaviti snimanje tako da ponovo pokrenete Čarobnjak \"Počni " +"Snimanje\"" #. module: base_module_record #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0 #: wizard_field:base_module_record.module_save,info,data_kind:0 msgid "Type of Data" -msgstr "" +msgstr "Tip Podataka" #. module: base_module_record #: wizard_view:base_module_record.module_record_objects,intro:0 #: wizard_view:base_module_record.module_save,info:0 msgid "Module Information" -msgstr "" +msgstr "Informacija o Modulu" #. module: base_module_record #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save msgid "Save Recorded Module" -msgstr "" +msgstr "Sacuvaj Snimljen Modul" #. module: base_module_record #: wizard_view:base_module_record.module_record,stop:0 msgid "" "Open ERP recording is stopped. Don't forget to save the recorded module." msgstr "" +"OpenERP Snimač je zaustavljen. Ne zaboravite da sacuvate snimljen Modul." #. module: base_module_record #: wizard_button:base_module_record.module_record,start,end:0 @@ -309,20 +319,20 @@ msgstr "" #: wizard_button:base_module_record.module_save,info,end:0 #: wizard_button:base_module_record.module_save,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Otkaži" #. module: base_module_record #: wizard_button:base_module_record.module_record_objects,save,end:0 #: wizard_button:base_module_record.module_save,save,end:0 msgid "Close" -msgstr "" +msgstr "Zatvori" #. module: base_module_record #: selection:base_module_record.module_record_objects,init,filter_cond:0 msgid "Created & Modified" -msgstr "" +msgstr "Kreiran & Izmijenjen" #. module: base_module_record #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop msgid "Stop Recording" -msgstr "" +msgstr "Zaustavi Snimanje" diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po index a0d62708967..d8c008b6b9e 100644 --- a/addons/base_report_creator/i18n/sr.po +++ b/addons/base_report_creator/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-21 12:24+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-10-16 09:40+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:12+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator @@ -24,378 +24,381 @@ msgid "" "records.\n" " e.g. res_partner.id=3" msgstr "" +"Unesite izraz za polje po kojem želite filtrirati zapise.\n" +"npr. res_partner.id=3" #. module: base_report_creator #: field:base_report_creator.report,view_graph_type:0 msgid "Graph Type" -msgstr "" +msgstr "Tip grafikona" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Used View" -msgstr "" +msgstr "Korišten prikaz" #. module: base_report_creator #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0 msgid "Filter Values" -msgstr "" +msgstr "Vrednosti filtra" #. module: base_report_creator #: field:base_report_creator.report.fields,graph_mode:0 msgid "Graph Mode" -msgstr "" +msgstr "Grafički" #. module: base_report_creator #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Pogrešno ime modela u definiciji akcije." #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Graph View" -msgstr "" +msgstr "Grafički prikaz" #. module: base_report_creator #: field:base_report_creator.report.filter,expression:0 msgid "Value" -msgstr "" +msgstr "Vrednost" #. module: base_report_creator #: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields msgid "Set Filter Fields" -msgstr "" +msgstr "Postavi filterska polja" #. module: base_report_creator #: selection:base_report_creator.report.fields,calendar_mode:0 msgid "Ending Date" -msgstr "" +msgstr "Datum završetka" #. module: base_report_creator #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter msgid "Report Filters" -msgstr "" +msgstr "Filteri izvještaja" #. module: base_report_creator #: view:base_report_creator.report:0 #: field:base_report_creator.report,sql_query:0 msgid "SQL Query" -msgstr "" +msgstr "SQL upit" #. module: base_report_creator #: view:base_report_creator.report:0 #: wizard_button:base_report_creator.report.menu.create,init,create_menu:0 msgid "Create Menu" -msgstr "" +msgstr "Kreiraj Meni" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Minimum" -msgstr "" +msgstr "Minimum" #. module: base_report_creator #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0 msgid "Operator" -msgstr "" +msgstr "Operator" #. module: base_report_creator #: selection:base_report_creator.report.filter,condition:0 #: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0 msgid "OR" -msgstr "" +msgstr "ILI" #. module: base_report_creator #: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action #: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action_config msgid "Custom Reports" -msgstr "" +msgstr "Prilagođeni izvještaji" #. module: base_report_creator #: wizard_view:base_report_creator.report.menu.create,init:0 msgid "Menu Information" -msgstr "" +msgstr "Informacije Menija" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Sum" -msgstr "" +msgstr "Suma" #. module: base_report_creator #: field:base_report_creator.report,model_ids:0 msgid "Reported Objects" -msgstr "" +msgstr "Navedeni objekti" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Field List" -msgstr "" +msgstr "Lista polja" #. module: base_report_creator #: field:base_report_creator.report,type:0 msgid "Report Type" -msgstr "" +msgstr "Tip izveštaja" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "State" -msgstr "" +msgstr "Stanje" #. module: base_report_creator #: selection:base_report_creator.report,state:0 msgid "Valid" -msgstr "" +msgstr "Potvrđeno" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Add filter" -msgstr "" +msgstr "Dodaj Filter" #. module: base_report_creator #: model:ir.actions.wizard,name:base_report_creator.wizard_menu_create msgid "Create Menu for Report" -msgstr "" +msgstr "Kreiraj Meni za Izveštaje" #. module: base_report_creator #: selection:base_report_creator.report,view_type1:0 #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Form" -msgstr "" +msgstr "Obrazac" #. module: base_report_creator #: selection:base_report_creator.report,view_type3:0 #: selection:base_report_creator.report.fields,calendar_mode:0 #: selection:base_report_creator.report.fields,graph_mode:0 msgid "/" -msgstr "" +msgstr "/" #. module: base_report_creator #: field:base_report_creator.report.fields,report_id:0 #: field:base_report_creator.report.filter,report_id:0 #: model:ir.model,name:base_report_creator.model_base_report_creator_report msgid "Report" -msgstr "" +msgstr "Izveštaj" #. module: base_report_creator #: selection:base_report_creator.report.fields,calendar_mode:0 msgid "Starting Date" -msgstr "" +msgstr "Početni datum" #. module: base_report_creator #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Nevažeći XML za pregled arhitekture" #. module: base_report_creator #: selection:base_report_creator.report,view_type1:0 #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Tree" -msgstr "" +msgstr "Stablo" #. module: base_report_creator #: field:base_report_creator.report,group_ids:0 msgid "Authorized Groups" -msgstr "" +msgstr "Autorizovane Grupe" #. module: base_report_creator #: field:base_report_creator.report,view_graph_orientation:0 msgid "Graph Orientation" -msgstr "" +msgstr "Orjentacija grafikona" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Authorized Groups (empty for all)" -msgstr "" +msgstr "Autorizovane Grupe(Prazno za sve)" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Security" -msgstr "" +msgstr "Bezbednost" #. module: base_report_creator #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0 msgid "Menu Name" -msgstr "" +msgstr "Naziv Menija" #. module: base_report_creator #: selection:base_report_creator.report.filter,condition:0 #: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0 msgid "AND" -msgstr "" +msgstr "I" #. module: base_report_creator #: field:base_report_creator.report.fields,calendar_mode:0 msgid "Calendar Mode" -msgstr "" +msgstr "Kalendar Mod" #. module: base_report_creator #: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields msgid "Display Fields" -msgstr "" +msgstr "Polja Displeja" #. module: base_report_creator #: selection:base_report_creator.report.fields,graph_mode:0 msgid "Y Axis" -msgstr "" +msgstr "Y osa" #. module: base_report_creator #: selection:base_report_creator.report,view_type1:0 #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Calendar" -msgstr "" +msgstr "Kalendar" #. module: base_report_creator #: selection:base_report_creator.report,view_type1:0 #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Graph" -msgstr "" +msgstr "Grafikon" #. module: base_report_creator #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0 msgid "Field Name" -msgstr "" +msgstr "Naziv polja" #. module: base_report_creator #: selection:base_report_creator.report,state:0 msgid "Draft" -msgstr "" +msgstr "Priprema" #. module: base_report_creator #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0 msgid "Set Filter Values" -msgstr "" +msgstr "Postavi Vrednosti Filtera" #. module: base_report_creator #: field:base_report_creator.report,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: base_report_creator #: selection:base_report_creator.report,view_graph_orientation:0 msgid "Vertical" -msgstr "" +msgstr "Uspravno" #. module: base_report_creator #: selection:base_report_creator.report,type:0 msgid "Rows And Columns Report" -msgstr "" +msgstr "Izvestaj redova i kolona" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "General Configuration" -msgstr "" +msgstr "Opšte podešavanje" #. module: base_report_creator #: wizard_view:base_report_creator.report_filter.fields,init:0 msgid "Select Field to filter" -msgstr "" +msgstr "Odaberite polje za filtriranje" #. module: base_report_creator #: field:base_report_creator.report,active:0 msgid "Active" -msgstr "" +msgstr "Aktivan" #. module: base_report_creator #: selection:base_report_creator.report,view_graph_orientation:0 msgid "Horizontal" -msgstr "" +msgstr "Vodoravno" #. module: base_report_creator #: field:base_report_creator.report.fields,group_method:0 msgid "Grouping Method" -msgstr "" +msgstr "Metod grupisanja" #. module: base_report_creator #: field:base_report_creator.report.filter,condition:0 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0 msgid "Condition" -msgstr "" +msgstr "Uslov" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Count" -msgstr "" +msgstr "Brojanje" #. module: base_report_creator #: selection:base_report_creator.report.fields,graph_mode:0 msgid "X Axis" -msgstr "" +msgstr "X osa" #. module: base_report_creator #: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0 msgid "Parent Menu" -msgstr "" +msgstr "Roditeljski Meni" #. module: base_report_creator #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0 msgid "Confirm Filter" -msgstr "" +msgstr "Potvrdi Filter" #. module: base_report_creator #: field:base_report_creator.report.filter,name:0 msgid "Filter Name" -msgstr "" +msgstr "Naziv Filtera" #. module: base_report_creator #: model:ir.actions.wizard,name:base_report_creator.wizard_report_open msgid "Open Report" -msgstr "" +msgstr "Otvori izveštaj" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Grouped" -msgstr "" +msgstr "Grupisano" #. module: base_report_creator #: view:base_report_creator.report:0 #: model:ir.module.module,shortdesc:base_report_creator.module_meta_information msgid "Report Creator" -msgstr "" +msgstr "Kreator izveštaja" #. module: base_report_creator #: wizard_button:base_report_creator.report.menu.create,init,end:0 #: wizard_button:base_report_creator.report_filter.fields,init,end:0 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0 msgid "Cancel" -msgstr "" +msgstr "Otkaži" #. module: base_report_creator #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" #. module: base_report_creator #: field:base_report_creator.report,view_type1:0 msgid "First View" -msgstr "" +msgstr "Prvi pogled" #. module: base_report_creator #: selection:base_report_creator.report.fields,calendar_mode:0 msgid "Delay" -msgstr "" +msgstr "Kašnjenje" #. module: base_report_creator #: field:base_report_creator.report.fields,field_id:0 msgid "Field" -msgstr "" +msgstr "Polje" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Filters on Fields" -msgstr "" +msgstr "Filteri na poljima" #. module: base_report_creator #: selection:base_report_creator.report,view_graph_type:0 msgid "Pie Chart" -msgstr "" +msgstr "Tortni grafikon" #. module: base_report_creator #: field:base_report_creator.report,view_type3:0 msgid "Third View" -msgstr "" +msgstr "Treći pogled" #. module: base_report_creator #: model:ir.module.module,description:base_report_creator.module_meta_information @@ -407,85 +410,91 @@ msgid "" "After installing the module, it adds a menu to define custom report in\n" "the \"Dashboard\" menu.\n" msgstr "" +"Ovi moduli vam dozvoljavaju kreiranje bilo kojeg statističkog\n" +"izvještaja iz više objekata. To je graditelj SQL upita i pretrazivac\n" +"za krajnje korisnike.\n" +"\n" +"Nakon instalacije, modul dodaje Meni za kreiranje prilagođenog izvještaja\n" +"na Meniju Glavne Table.\n" #. module: base_report_creator #: selection:base_report_creator.report.fields,calendar_mode:0 msgid "Uniq Colors" -msgstr "" +msgstr "Jedinstvene boje" #. module: base_report_creator #: field:base_report_creator.report,name:0 msgid "Report Name" -msgstr "" +msgstr "Naziv izveštaja" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Fields" -msgstr "" +msgstr "Polja" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Average" -msgstr "" +msgstr "Prosečno" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "Reports" -msgstr "" +msgstr "Izveštaji" #. module: base_report_creator #: selection:base_report_creator.report.fields,group_method:0 msgid "Maximum" -msgstr "" +msgstr "Maksimum" #. module: base_report_creator #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0 msgid "Continue" -msgstr "" +msgstr "Nastavi" #. module: base_report_creator #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0 msgid "Values" -msgstr "" +msgstr "Вредности" #. module: base_report_creator #: selection:base_report_creator.report,view_graph_type:0 msgid "Bar Chart" -msgstr "" +msgstr "Bar grafikon" #. module: base_report_creator #: field:base_report_creator.report,view_type2:0 msgid "Second View" -msgstr "" +msgstr "Drugi pogled" #. module: base_report_creator #: wizard_view:base_report_creator.report.menu.create,init:0 msgid "Create Menu For This Report" -msgstr "" +msgstr "Kreiraj Meni za ovaj izveštaj" #. module: base_report_creator #: view:base_report_creator.report:0 msgid "View parameters" -msgstr "" +msgstr "Parametri prikaza" #. module: base_report_creator #: field:base_report_creator.report.fields,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Sekvenca" #. module: base_report_creator #: wizard_field:base_report_creator.report_filter.fields,init,field_id:0 msgid "Filter Field" -msgstr "" +msgstr "polje Filtera" #. module: base_report_creator #: view:base_report_creator.report:0 #: field:base_report_creator.report,field_ids:0 msgid "Fields to Display" -msgstr "" +msgstr "Polja za Prikaz" #. module: base_report_creator #: view:base_report_creator.report:0 #: field:base_report_creator.report,filter_ids:0 msgid "Filters" -msgstr "" +msgstr "Filteri" diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po index bee67bea6e7..74bacc3daa9 100644 --- a/addons/base_report_designer/i18n/sr.po +++ b/addons/base_report_designer/i18n/sr.po @@ -8,89 +8,89 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-21 12:23+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-10-16 09:24+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-29 05:08+0000\n" +"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_designer #: wizard_field:base_report_designer.modify,init,text:0 msgid "Introduction" -msgstr "" +msgstr "Predstavljanje" #. module: base_report_designer #: wizard_view:base_report_designer.modify,send_form:0 msgid "Upload your modified report" -msgstr "" +msgstr "Pošalji promenjen izveštaj na Server" #. module: base_report_designer #: wizard_button:base_report_designer.modify,get_form_result,send_form:0 msgid "Upload the modified report" -msgstr "" +msgstr "Pošalji promenjen izveštaj na Server" #. module: base_report_designer #: wizard_view:base_report_designer.modify,get_form_result:0 msgid "The .SXW report" -msgstr "" +msgstr ".SXW Izveštaj" #. module: base_report_designer #: wizard_view:base_report_designer.modify,send_form_result:0 msgid "Report modified" -msgstr "" +msgstr "Izveštaj je promenjen" #. module: base_report_designer #: wizard_button:base_report_designer.modify,init,get_form:0 msgid "Modify a report" -msgstr "" +msgstr "Izmeni Izveštaj" #. module: base_report_designer #: wizard_view:base_report_designer.modify,send_form_result:0 msgid "Your report has been modified." -msgstr "" +msgstr "Vaš je Izveštaj izmenjen" #. module: base_report_designer #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information msgid "Report designer interface module" -msgstr "" +msgstr "Modul Interfejsa Dizajnera Izveštaja" #. module: base_report_designer #: wizard_field:base_report_designer.modify,get_form,report_id:0 #: wizard_field:base_report_designer.modify,get_form_result,report_id:0 #: wizard_field:base_report_designer.modify,send_form,report_id:0 msgid "Report" -msgstr "" +msgstr "Izveštaj" #. module: base_report_designer #: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify msgid "Report Designer" -msgstr "" +msgstr "Dizajner Izvještaja" #. module: base_report_designer #: wizard_view:base_report_designer.modify,get_form:0 #: wizard_view:base_report_designer.modify,get_form_result:0 #: wizard_view:base_report_designer.modify,send_form:0 msgid "Get a report" -msgstr "" +msgstr "Napravi Izvještaj" #. module: base_report_designer #: wizard_button:base_report_designer.modify,get_form,get_form_result:0 msgid "Continue" -msgstr "" +msgstr "Nastavi" #. module: base_report_designer #: wizard_field:base_report_designer.modify,get_form_result,file_sxw:0 #: wizard_field:base_report_designer.modify,send_form,file_sxw:0 msgid "Your .SXW file" -msgstr "" +msgstr "Vaša .SXW datoteka" #. module: base_report_designer #: wizard_view:base_report_designer.modify,init:0 msgid "Report designer" -msgstr "" +msgstr "Dizajner Izveštaja" #. module: base_report_designer #: wizard_view:base_report_designer.modify,get_form_result:0 @@ -100,47 +100,51 @@ msgid "" "to modify it. Once it is modified, re-upload it in Open ERP using this " "wizard." msgstr "" +"Ovo je Predložak vašeg traženog Izveštaja. Spremite ga kao .SXW datoteku i " +"otvorite s programon OpenOffice. Ne zaboravite instalirati Tiny OpenOffice " +"paket kako biste mogli vršiti izmjene. kad izvršite izmjene, vratite " +"datoteku u Open ERP koristeći ovaj Čarobnjak." #. module: base_report_designer #: wizard_button:base_report_designer.modify,send_form,send_form_result:0 msgid "Update the report" -msgstr "" +msgstr "Ažurirajte Izvještaj" #. module: base_report_designer #: selection:base_report_designer.modify,init,operation:0 msgid "Create a new report" -msgstr "" +msgstr "Napravi novi Izvještaj" #. module: base_report_designer #: selection:base_report_designer.modify,init,operation:0 #: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify msgid "Modify an existing report" -msgstr "" +msgstr "Izmeni postojeći izveštaj" #. module: base_report_designer #: wizard_button:base_report_designer.modify,get_form,end:0 #: wizard_button:base_report_designer.modify,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Otkaži" #. module: base_report_designer #: wizard_button:base_report_designer.modify,get_form_result,end:0 #: wizard_button:base_report_designer.modify,send_form,end:0 #: wizard_button:base_report_designer.modify,send_form_result,end:0 msgid "Close" -msgstr "" +msgstr "Zatvori" #. module: base_report_designer #: wizard_field:base_report_designer.modify,init,operation:0 msgid "Operation" -msgstr "" +msgstr "Postupak" #. module: base_report_designer #: wizard_view:base_report_designer.modify,init:0 msgid "Report designer introduction" -msgstr "" +msgstr "Uvod u Dizajner Izveštaja" #. module: base_report_designer #: wizard_view:base_report_designer.modify,get_form:0 msgid "Select your report" -msgstr "" +msgstr "Odaberite izvještaj" diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po index cb71335bbef..1c11be3bb17 100644 --- a/addons/base_setup/i18n/sr.po +++ b/addons/base_setup/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 15:31+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 08:51+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py index bd285821e2b..3bb46827d68 100644 --- a/addons/base_synchro/__openerp__.py +++ b/addons/base_synchro/__openerp__.py @@ -22,7 +22,7 @@ { "name":"Base Synchro", "version":"0.1", - "author":"Tiny", + "author":"OpenERP SA", "category":"Generic Modules/Base", "description": """Synchronization with all objects.""", "depends":["base"], diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po index f9cd814e4ad..98aecb1e7f2 100644 --- a/addons/base_vat/i18n/sr.po +++ b/addons/base_vat/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 15:18+0000\n" -"Last-Translator: zmmaj \n" +"PO-Revision-Date: 2010-10-15 08:42+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_vat diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml index 675143342c0..7c7c0da57cf 100644 --- a/addons/board/board_administration_view.xml +++ b/addons/board/board_administration_view.xml @@ -1,57 +1,6 @@ - - - latest.activities.tree - res.log - tree - - - - - - - - - - - - Latest Activities - res.log - form - tree,form - - - - - board.administration.form - board.board - form - -
- - - - - - - -
- - - - Administration Dashboard - board.board - form - form - - - - - - user.connection.tree @@ -72,17 +21,39 @@ - - board.user.connection.form + + + Latest Activities + res.log + form + tree,form + + + board.administration.form board.board form - - - - +
+ + + + + + + + +
+ + Administration Dashboard + board.board + form + form + + + + diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py index cdb06a17a1f..40088cb0bac 100644 --- a/addons/caldav/__openerp__.py +++ b/addons/caldav/__openerp__.py @@ -21,12 +21,12 @@ { - "name" : "Share Calendar using Caldav", - "version" : "1.0", + "name" : "Share Calendar using CalDAV", + "version" : "1.1", "depends" : [ "base", "document_webdav", - ], + ], 'description': """ This module Contains basic functionality for caldav system like: - Webdav server that provides remote access to calendar @@ -34,7 +34,10 @@ - Customize calendar event and todo attribute with any of OpenERP model - Provides iCal Import/Export functionality - To access OpenERP Calendar using caldav to remote site use the URL like: + To access Calendars using CalDAV clients, point them to: + http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c + + To access OpenERP Calendar using WebCal to remote site use the URL like: http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics Where, @@ -53,7 +56,8 @@ 'wizard/calendar_event_export_view.xml', 'wizard/calendar_event_import_view.xml', 'wizard/calendar_event_subscribe_view.xml', - 'caldav_view.xml' + 'caldav_view.xml', + 'caldav_setup.xml' ], "installable" : True, "active" : False, diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py index 11f720bdcab..b735d853025 100644 --- a/addons/caldav/caldav_node.py +++ b/addons/caldav/caldav_node.py @@ -20,41 +20,29 @@ ############################################################################## import time -from document import nodes +from document_webdav import nodes +from document.nodes import _str2time +import logging import StringIO +from orm_utils import get_last_modified -class node_database(nodes.node_database): - def _child_get(self, cr, name=False, parent_id=False, domain=None): - dirobj = self.context._dirobj - uid = self.context.uid - ctx = self.context.context.copy() - ctx.update(self.dctx) - if not domain: - domain = [] - domain2 = domain + [('calendar_collection','=', False)] - res = super(node_database, self)._child_get(cr, name=name, parent_id=parent_id, domain=domain2) - where = [('parent_id','=',parent_id)] - domain2 = domain + [('calendar_collection','=', True)] - if name: - where.append(('name','=',name)) - if domain2: - where += domain2 +try: + from tools.dict_tools import dict_merge, dict_merge2 +except ImportError: + from document.dict_tools import dict_merge, dict_merge2 - where2 = where + [('type', '=', 'directory')] - ids = dirobj.search(cr, uid, where2, context=ctx) - for dirr in dirobj.browse(cr,uid,ids,context=ctx): - res.append(node_calendar_collection(dirr.name,self,self.context,dirr)) - return res +# TODO: implement DAV-aware errors, inherit from IOError + +# Assuming that we have set global properties right, we mark *all* +# directories as having calendar-access. +nodes.node_dir.http_options = dict_merge2(nodes.node_dir.http_options, + { 'DAV': ['calendar-access',] }) class node_calendar_collection(nodes.node_dir): - DAV_PROPS = { - "http://calendarserver.org/ns/" : ('getctag',), - } - DAV_M_NS = { - "http://calendarserver.org/ns/" : '_get_dav', - } - - http_options = { 'DAV': ['calendar-access'] } + DAV_PROPS = dict_merge2(nodes.node_dir.DAV_PROPS, + { "http://calendarserver.org/ns/" : ('getctag',), } ) + DAV_M_NS = dict_merge2(nodes.node_dir.DAV_M_NS, + { "http://calendarserver.org/ns/" : '_get_dav', } ) def _file_get(self,cr, nodename=False): return [] @@ -80,45 +68,117 @@ class node_calendar_collection(nodes.node_dir): for cal in fil_obj.browse(cr, uid, ids, context=ctx): if (not name) or not ext: res.append(node_calendar(cal.name, self, self.context, cal)) - if (not name) or ext: + if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'): + # these ones must not see the webcal entry. + continue + if cal.has_webcal and (not name) or ext: res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal)) # May be both of them! return res - def _get_dav_owner(self, cr): - # Todo? - return False - def _get_ttag(self, cr): return 'calen-dir-%d' % self.dir_id def _get_dav_getctag(self, cr): - result = self.get_etag(cr) - return str(result) + dirobj = self.context._dirobj + uid = self.context.uid + ctx = self.context.context.copy() + ctx.update(self.dctx) + where = [('collection_id','=',self.dir_id)] + bc_obj = dirobj.pool.get('basic.calendar') + + res = get_last_modified(bc_obj, cr, uid, where, context=ctx) + return _str2time(res) + +class node_calendar_res_col(nodes.node_res_obj): + """ Calendar collection, as a dynamically created node + + This class shall be used instead of node_calendar_collection, when the + node is under dynamic ones. + """ + DAV_PROPS = dict_merge2(nodes.node_res_obj.DAV_PROPS, + { "http://calendarserver.org/ns/" : ('getctag',), } ) + DAV_M_NS = dict_merge2(nodes.node_res_obj.DAV_M_NS, + { "http://calendarserver.org/ns/" : '_get_dav', } ) + + def _file_get(self,cr, nodename=False): + return [] + + def _child_get(self, cr, name=False, parent_id=False, domain=None): + dirobj = self.context._dirobj + uid = self.context.uid + ctx = self.context.context.copy() + ctx.update(self.dctx) + where = [('collection_id','=',self.dir_id)] + ext = False + if name and name.endswith('.ics'): + name = name[:-4] + ext = True + if name: + where.append(('name','=',name)) + if not domain: + domain = [] + where = where + domain + fil_obj = dirobj.pool.get('basic.calendar') + ids = fil_obj.search(cr,uid,where,context=ctx) + res = [] + # TODO: shall we use any of our dynamic information?? + for cal in fil_obj.browse(cr, uid, ids, context=ctx): + if (not name) or not ext: + res.append(node_calendar(cal.name, self, self.context, cal)) + if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'): + # these ones must not see the webcal entry. + continue + if cal.has_webcal and (not name) or ext: + res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal)) + # May be both of them! + return res + + def _get_ttag(self, cr): + return 'calen-dir-%d' % self.dir_id + + def _get_dav_getctag(self, cr): + dirobj = self.context._dirobj + uid = self.context.uid + ctx = self.context.context.copy() + ctx.update(self.dctx) + where = [('collection_id','=',self.dir_id)] + bc_obj = dirobj.pool.get('basic.calendar') + + res = get_last_modified(bc_obj, cr, uid, where, context=ctx) + return _str2time(res) class node_calendar(nodes.node_class): our_type = 'collection' DAV_PROPS = { - "DAV:": ('principal-collection-set'), - "http://cal.me.com/_namespace/" : ('user-state'), - "http://calendarserver.org/ns/" : ( - 'dropbox-home-URL', - 'notification-URL', - 'getctag',), + "DAV:": ('supported-report-set',), + # "http://cal.me.com/_namespace/" : ('user-state',), + "http://calendarserver.org/ns/" : ( 'getctag',), 'http://groupdav.org/': ('resourcetype',), "urn:ietf:params:xml:ns:caldav" : ( - 'calendar-description', + 'calendar-description', + 'supported-calendar-component-set', + ), + "http://apple.com/ns/ical/": ("calendar-color", "calendar-order"), + } + DAV_PROPS_HIDDEN = { + "urn:ietf:params:xml:ns:caldav" : ( 'calendar-data', - 'calendar-home-set', - 'calendar-user-address-set', - 'schedule-inbox-URL', - 'schedule-outbox-URL',)} + 'calendar-timezone', + 'supported-calendar-data', + 'max-resource-size', + 'min-date-time', + 'max-date-time', + )} + DAV_M_NS = { "DAV:" : '_get_dav', - "http://cal.me.com/_namespace/": '_get_dav', + # "http://cal.me.com/_namespace/": '_get_dav', 'http://groupdav.org/': '_get_gdav', "http://calendarserver.org/ns/" : '_get_dav', - "urn:ietf:params:xml:ns:caldav" : '_get_caldav'} + "urn:ietf:params:xml:ns:caldav" : '_get_caldav', + "http://apple.com/ns/ical/": '_get_apple_cal', + } http_options = { 'DAV': ['calendar-access'] } @@ -131,42 +191,33 @@ class node_calendar(nodes.node_class): self.content_length = 0 self.displayname = calendar.name self.cal_type = calendar.type + self.cal_color = calendar.calendar_color or None + self.cal_order = calendar.calendar_order or None + try: + self.uuser = (calendar.user_id and calendar.user_id.login) or 'nobody' + except Exception: + self.uuser = 'nobody' def _get_dav_getctag(self, cr): - result = self._get_ttag(cr) + ':' + str(time.time()) - return str(result) + dirobj = self.context._dirobj + uid = self.context.uid + ctx = self.context.context.copy() + ctx.update(self.dctx) - def _get_dav_dropbox_home_URL(self, cr): - import urllib - uid = self.context.uid - ctx = self.context.context.copy() - ctx.update(self.dctx) - calendar_obj = self.context._dirobj.pool.get('basic.calendar') - calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) - res = '%s/%s' %(calendar.collection_id.name, calendar.name) - url = urllib.quote('/%s/%s' % (cr.dbname, res)) - return url - - def _get_dav_notification_URL(self, cr): - import urllib - uid = self.context.uid - ctx = self.context.context.copy() - ctx.update(self.dctx) - calendar_obj = self.context._dirobj.pool.get('basic.calendar') - calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) - res = '%s/%s' %(calendar.collection_id.name, calendar.name) - url = urllib.quote('/%s/%s' % (cr.dbname, res)) - return url + bc_obj = dirobj.pool.get('basic.calendar') + res = bc_obj.get_cal_max_modified(cr, uid, [self.calendar_id], self, domain=[], context=ctx) + return _str2time(res) def _get_dav_user_state(self, cr): #TODO - return True - + return 'online' def get_dav_resourcetype(self, cr): res = [ ('collection', 'DAV:'), - (str(self.cal_type + '-collection'), 'http://groupdav.org/'), - ('calendar', 'urn:ietf:params:xml:ns:caldav') ] + ('calendar', 'urn:ietf:params:xml:ns:caldav'), + ] + if self.context.get('DAV-client', '') == 'GroupDAV': + res.append((str(self.cal_type + '-collection'), 'http://groupdav.org/')) return res def get_domain(self, cr, filters): @@ -174,6 +225,7 @@ class node_calendar(nodes.node_class): res = [] if not filters: return res + _log = logging.getLogger('caldav.query') if filters.localName == 'calendar-query': res = [] for filter_child in filters.childNodes: @@ -189,26 +241,33 @@ class node_calendar(nodes.node_class): if vevent_filter.nodeType == vevent_filter.TEXT_NODE: continue if vevent_filter.localName == 'comp-filter': - if vevent_filter.getAttribute('name') == 'VEVENT': - res = [('type','=','vevent')] - if vevent_filter.getAttribute('name') == 'VTODO': - res = [('type','=','vtodo')] + if vevent_filter.getAttribute('name'): + res = [('type','=',vevent_filter.getAttribute('name').lower() )] + + for cfe in vevent_filter.childNodes: + if cfe.localName == 'time-range': + if cfe.getAttribute('start'): + _log.warning("Ignore start.. ") + # No, it won't work in this API + #val = cfe.getAttribute('start') + #res += [('dtstart','=', cfe)] + elif cfe.getAttribute('end'): + _log.warning("Ignore end.. ") + else: + _log.debug("Unknown comp-filter: %s", cfe.localName) + else: + _log.debug("Unknown comp-filter: %s", vevent_filter.localName) + else: + _log.debug("Unknown filter element: %s", vcalendar_filter.localName) + else: + _log.debug("Unknown calendar-query element: %s", filter_child.localName) return res elif filters.localName == 'calendar-multiget': - names = [] - for filter_child in filters.childNodes: - if filter_child.nodeType == filter_child.TEXT_NODE: - continue - if filter_child.localName == 'href': - if not filter_child.firstChild: - continue - uri = filter_child.firstChild.data - caluri = uri.split('/') - if len(caluri): - caluri = caluri[-2] - if caluri not in names : names.append(caluri) - res = [('name','in',names)] - return res + # this is not the place to process, as it wouldn't support multi-level + # hrefs. So, the code is moved to document_webdav/dav_fs.py + pass + else: + _log.debug("Unknown element in REPORT: %s", filters.localName) return res def children(self, cr, domain=None): @@ -227,26 +286,33 @@ class node_calendar(nodes.node_class): ctx = self.context.context.copy() ctx.update(self.dctx) where = [] + bc_obj = dirobj.pool.get('basic.calendar') + if name: if name.endswith('.ics'): name = name[:-4] try: - where.append(('id','=',int(name))) + if name.isdigit(): + where.append(('id','=',int(name))) + else: + bca_obj = dirobj.pool.get('basic.calendar.alias') + bc_alias = bca_obj.search(cr, uid, + [('cal_line_id.calendar_id', '=', self.calendar_id), + ('name', '=', name)] ) + if not bc_alias: + return [] + bc_val = bca_obj.read(cr, uid, bc_alias, ['res_id',]) + where.append(('id', '=', bc_val[0]['res_id'])) except ValueError: # if somebody requests any other name than the ones we # generate (non-numeric), it just won't exist - # FIXME: however, this confuses Evolution (at least), which - # thinks the .ics node hadn't been saved. return [] if not domain: domain = [] - fil_obj = dirobj.pool.get('basic.calendar') - ids = fil_obj.search(cr, uid, domain) - res = [] - if self.calendar_id in ids: - res = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=where, context=ctx) + # we /could/ be supplying an invalid calendar id to bc_obj, it has to check + res = bc_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=where, context=ctx) return res def create_child(self, cr, path, data): @@ -268,7 +334,24 @@ class node_calendar(nodes.node_class): assert isinstance(res[0], (int, long)) fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=[('id','=',res[0])], context=ctx) + if self.context.get('DAV-client','') in ('iPhone', 'iCalendar',): + # For those buggy clients, register the alias + bca_obj = fil_obj.pool.get('basic.calendar.alias') + ourcal = fil_obj.browse(cr, uid, self.calendar_id) + line_id = None + for line in ourcal.line_ids: + if line.name == ourcal.type: + line_id = line.id + break + assert line_id, "Calendar #%d must have at least one %s line" % \ + (ourcal.id, ourcal.type) + if path.endswith('.ics'): + path = path[:-4] + bca_obj.create(cr, uid, { 'cal_line_id': line_id, + 'res_id': res[0], 'name': path}, context=ctx) return fnodes[0] + # If we reach this line, it means that we couldn't import any useful + # (and matching type vs. our node kind) data from the iCal content. return None @@ -287,8 +370,12 @@ class node_calendar(nodes.node_class): def rmcol(self, cr): return False - def _get_caldav_calendar_data(self, cr): + if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'): + # Never return collective data to iClients, they get confused + # because they do propfind on the calendar node with Depth=1 + # and only expect the childrens' data + return None res = [] for child in self.children(cr): res.append(child._get_caldav_calendar_data(cr)) @@ -299,86 +386,54 @@ class node_calendar(nodes.node_class): calendar_obj = self.context._dirobj.pool.get('basic.calendar') ctx = self.context.context.copy() ctx.update(self.dctx) - calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) - return calendar.description + try: + calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) + return calendar.description or calendar.name + except Exception, e: + return None - def _get_dav_principal_collection_set(self, cr): - import xml - import urllib - uid = self.context.uid - ctx = self.context.context.copy() - ctx.update(self.dctx) - calendar_obj = self.context._dirobj.pool.get('basic.calendar') - calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) - res = '%s/%s' %(calendar.collection_id.name, calendar.name) - doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None) - href = doc.documentElement - href.tagName = 'D:href' - huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res))) - href.appendChild(huri) - return href + def _get_dav_supported_report_set(self, cr): + + return ('supported-report', 'DAV:', + ('report','DAV:', + ('principal-match','DAV:') + ) + ) - def _get_caldav_calendar_home_set(self, cr): - import xml.dom.minidom - import urllib - uid = self.context.uid - ctx = self.context.context.copy() - ctx.update(self.dctx) - doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None) + def _get_caldav_supported_calendar_component_set(self, cr): + return ('comp', 'urn:ietf:params:xml:ns:caldav', None, + {'name': self.cal_type.upper()} ) + + def _get_caldav_calendar_timezone(self, cr): + return None #TODO + + def _get_caldav_supported_calendar_data(self, cr): + return ('calendar-data', 'urn:ietf:params:xml:ns:caldav', None, + {'content-type': "text/calendar", 'version': "2.0" } ) + + def _get_caldav_max_resource_size(self, cr): + return 65535 - calendar_obj = self.context._dirobj.pool.get('basic.calendar') - calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) - huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, calendar.collection_id.name))) - href = doc.documentElement - href.tagName = 'D:href' - href.appendChild(huri) - return href + def _get_caldav_min_date_time(self, cr): + return "19700101T000000Z" - def _get_caldav_calendar_user_address_set(self, cr): - import xml.dom.minidom - uid = self.context.uid - ctx = self.context.context.copy() - ctx.update(self.dctx) - user_obj = self.context._dirobj.pool.get('res.users') - user = user_obj.browse(cr, uid, uid, context=ctx) - doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None) - href = doc.documentElement - href.tagName = 'D:href' - huri = doc.createTextNode('MAILTO:' + str(user.email) or str(user.name)) - href.appendChild(huri) - return href - - def _get_caldav_schedule_outbox_URL(self, cr): - return self._get_caldav_schedule_inbox_URL(cr) - - def _get_caldav_schedule_inbox_URL(self, cr): - import xml.dom.minidom - import urllib - uid = self.context.uid - ctx = self.context.context.copy() - ctx.update(self.dctx) - calendar_obj = self.context._dirobj.pool.get('basic.calendar') - calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx) - res = '%s/%s' %(calendar.collection_id.name, calendar.name) - doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None) - href = doc.documentElement - href.tagName = 'D:href' - huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res))) - href.appendChild(huri) - return href + def _get_caldav_max_date_time(self, cr): + return "21001231T235959Z" # I will be dead by then + + def _get_apple_cal_calendar_color(self, cr): + return self.cal_color + def _get_apple_cal_calendar_order(self, cr): + return self.cal_order class res_node_calendar(nodes.node_class): our_type = 'file' DAV_PROPS = { - "http://calendarserver.org/ns/" : ('getctag'), + "http://calendarserver.org/ns/" : ('getctag',), "urn:ietf:params:xml:ns:caldav" : ( 'calendar-description', 'calendar-data', - 'calendar-home-set', - 'calendar-user-address-set', - 'schedule-inbox-URL', - 'schedule-outbox-URL',)} + )} DAV_M_NS = { "http://calendarserver.org/ns/" : '_get_dav', "urn:ietf:params:xml:ns:caldav" : '_get_caldav'} @@ -393,7 +448,7 @@ class res_node_calendar(nodes.node_class): self.calendar_id = hasattr(parent, 'calendar_id') and parent.calendar_id or False if res_obj: if not self.calendar_id: self.calendar_id = res_obj.id - pr = res_obj.perm_read()[0] + pr = res_obj.perm_read(context=context, details=False)[0] self.create_date = pr.get('create_date') self.write_date = pr.get('write_date') or pr.get('create_date') self.displayname = res_obj.name @@ -414,6 +469,7 @@ class res_node_calendar(nodes.node_class): uid = self.context.uid calendar_obj = self.context._dirobj.pool.get('basic.calendar') context = self.context.context.copy() + context.update(self.dctx) context.update({'model': self.model, 'res_id':self.res_id}) res = calendar_obj.export_cal(cr, uid, [self.calendar_id], context=context) return res @@ -426,8 +482,11 @@ class res_node_calendar(nodes.node_class): def set_data(self, cr, data, fil_obj = None): uid = self.context.uid + context = self.context.context.copy() + context.update(self.dctx) + context.update({'model': self.model, 'res_id':self.res_id}) calendar_obj = self.context._dirobj.pool.get('basic.calendar') - res = calendar_obj.import_cal(cr, uid, data, self.calendar_id) + res = calendar_obj.import_cal(cr, uid, data, self.calendar_id, context=context) return res def _get_ttag(self,cr): @@ -438,7 +497,6 @@ class res_node_calendar(nodes.node_class): res = '%d' % (self.calendar_id) return res - def rm(self, cr): uid = self.context.uid res = False diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml new file mode 100644 index 00000000000..c33edbc75f7 --- /dev/null +++ b/addons/caldav/caldav_setup.xml @@ -0,0 +1,88 @@ + + + + + + [] + + + + + + directory + + calendars + + + [] + + + + + directory + + resources + + + [] + + + + + + ressource + + + __uids__ + + + [] + + + + + + + ressource + + + users + + + + user_id + res_id + + + [] + + + + + + directory + + c + + + + [] + + + + + + directory + + groups + + + + urn:ietf:params:xml:ns:caldav + + calendar-home-set + ('href','DAV:','/%s/%s/calendars/users/%s/c' % ('webdav',dbname,username) ) + + + + diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml index 2e9719efead..97656a954ad 100644 --- a/addons/caldav/caldav_view.xml +++ b/addons/caldav/caldav_view.xml @@ -74,6 +74,9 @@ + + + diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py index 068af56459f..ccc4bf39fac 100644 --- a/addons/caldav/calendar.py +++ b/addons/caldav/calendar.py @@ -30,7 +30,10 @@ import pytz import re import tools import time +import logging from caldav_node import res_node_calendar +from orm_utils import get_last_modified +from tools.safe_eval import safe_eval as eval try: import vobject @@ -63,12 +66,13 @@ def uid2openobjectid(cr, uidval, oomodel, rdate): return (False, None) qry = 'SELECT DISTINCT(id) FROM %s' % model_obj._table if rdate: - qry += " where recurrent_id='%s'" % (rdate) #TOFIX: sql injection - cr.execute(qry) + qry += " WHERE recurrent_id=%s" + cr.execute(qry, (rdate,)) r_id = cr.fetchone() if r_id: return (id, r_id[0]) - + else: + return (False, None) cr.execute(qry) ids = map(lambda x: str(x[0]), cr.fetchall()) if id in ids: @@ -232,6 +236,7 @@ def map_data(cr, uid, obj, context=None): class CalDAV(object): __attribute__ = {} + _logger = logging.getLogger('document.caldav') def ical_set(self, name, value, type): """ set calendar Attribute @@ -294,6 +299,7 @@ class CalDAV(object): att_data = [] exdates = [] + _server_tzinfo = pytz.timezone(tools.get_server_timezone()) for cal_data in child.getChildren(): if cal_data.name.lower() == 'organizer': @@ -329,8 +335,8 @@ class CalDAV(object): if cal_data.name.lower() in self.__attribute__: if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'): self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value') - date_utc = cal_data.value.astimezone(pytz.utc) - self.ical_set(cal_data.name.lower(), date_utc, 'value') + date_local = cal_data.value.astimezone(_server_tzinfo) + self.ical_set(cal_data.name.lower(), date_local, 'value') continue self.ical_set(cal_data.name.lower(), cal_data.value, 'value') vals = map_data(cr, uid, self, context=context) @@ -576,6 +582,13 @@ class Calendar(CalDAV, osv.osv): 'create_date': fields.datetime('Created Date', readonly=True), 'write_date': fields.datetime('Modifided Date', readonly=True), 'description': fields.text("description"), + 'calendar_color': fields.char('Color', size=20, help="For supporting clients, the color of the calendar entries"), + 'calendar_order': fields.integer('Order', help="For supporting clients, the order of this folder among the calendars"), + 'has_webcal': fields.boolean('WebCal', required=True, help="Also export a .ics entry next to the calendar folder, with WebCal content."), + } + + _defaults = { + 'has_webcal': False, } def get_calendar_objects(self, cr, uid, ids, parent=None, domain=None, context=None): @@ -592,7 +605,7 @@ class Calendar(CalDAV, osv.osv): continue if line.name in ('valarm', 'attendee'): continue - line_domain = eval(line.domain or '[]') + line_domain = eval(line.domain or '[]', context) line_domain += domain if ctx_res_id: line_domain += [('id','=',ctx_res_id)] @@ -606,6 +619,32 @@ class Calendar(CalDAV, osv.osv): node = res_node_calendar('%s.ics' %data.id, parent, ctx, data, line.object_id.model, data.id) res.append(node) return res + + + def get_cal_max_modified(self, cr, uid, ids, parent=None, domain=None, context=None): + if not context: + context = {} + if not domain: + domain = [] + res = None + ctx_res_id = context.get('res_id', None) + ctx_model = context.get('model', None) + for cal in self.browse(cr, uid, ids): + for line in cal.line_ids: + if ctx_model and ctx_model != line.object_id.model: + continue + if line.name in ('valarm', 'attendee'): + continue + line_domain = eval(line.domain or '[]', context) + line_domain += domain + if ctx_res_id: + line_domain += [('id','=',ctx_res_id)] + mod_obj = self.pool.get(line.object_id.model) + max_data = get_last_modified(mod_obj, cr, uid, line_domain, context=context) + if res and res > max_data: + continue + res = max_data + return res def export_cal(self, cr, uid, ids, vobj='vevent', context=None): """ Export Calendar @@ -624,7 +663,7 @@ class Calendar(CalDAV, osv.osv): continue if line.name in ('valarm', 'attendee'): continue - domain = eval(line.domain or '[]') + domain = eval(line.domain or '[]', context) if ctx_res_id: domain += [('id','=',ctx_res_id)] mod_obj = self.pool.get(line.object_id.model) @@ -668,6 +707,15 @@ class Calendar(CalDAV, osv.osv): val = self.parse_ics(cr, uid, child, cal_children=cal_children, context=context) vals.append(val) objs.append(cal_children[child.name.lower()]) + elif child.name.upper() == 'CALSCALE': + if child.value.upper() != 'GREGORIAN': + self._logger.warning('How do I handle %s calendars?',child.value) + elif child.name.upper() in ('PRODID', 'VERSION'): + pass + elif child.name.upper().startswith('X-'): + self._logger.debug("skipping custom node %s", child.name) + else: + self._logger.debug("skipping node %s", child.name) res = [] for obj_name in list(set(objs)): @@ -728,6 +776,30 @@ line "%s" more than once' % (vals.get('name')))) basic_calendar_line() +class basic_calendar_alias(osv.osv): + """ Mapping of client filenames to ORM ids of calendar records + + Since some clients insist on putting arbitrary filenames on the .ics data + they send us, and they won't respect the redirection "Location:" header, + we have to store those filenames and allow clients to call our calendar + records with them. + Note that adding a column to all tables that would possibly hold calendar- + mapped data won't work. The user is always allowed to specify more + calendars, on any arbitrary ORM object, without need to alter those tables' + data or structure + """ + _name = 'basic.calendar.alias' + _columns = { + 'name': fields.char('Filename', size=512, required=True, select=1), + 'cal_line_id': fields.many2one('basic.calendar.lines', 'Calendar', required=True, + select=1, help='The calendar/line this mapping applies to'), + 'res_id': fields.integer('Res. ID', required=True, select=1), + } + + _sql_constraints = [ ('name_cal_uniq', 'UNIQUE(cal_line_id, name)', + _('The same filename cannot apply to two records!')), ] + +basic_calendar_alias() class basic_calendar_attribute(osv.osv): _name = 'basic.calendar.attributes' diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py index 8dd4ff053c9..52fe698647c 100644 --- a/addons/caldav/calendar_collection.py +++ b/addons/caldav/calendar_collection.py @@ -18,9 +18,11 @@ # along with this program. If not, see . # ############################################################################## + from osv import osv, fields from tools.translate import _ import caldav_node +import logging class calendar_collection(osv.osv): _inherit = 'document.directory' @@ -30,7 +32,8 @@ class calendar_collection(osv.osv): } _default = { 'calendar_collection' : False, - } + } + def _get_root_calendar_directory(self, cr, uid, context=None): objid = self.pool.get('ir.model.data') try: @@ -40,18 +43,25 @@ class calendar_collection(osv.osv): root_id = objid.read(cr, uid, mid, ['res_id'])['res_id'] root_cal_dir = self.browse(cr,uid, root_id, context=context) return root_cal_dir.name - except Exception, e: - import netsvc - logger = netsvc.Logger() - logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set root directory for Calendars:'+ str(e)) + except Exception: + logger = logging.getLogger('document') + logger.warning('Cannot set root directory for Calendars:', exc_info=True) return False return False - def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext): - """ try to locate the node in uri, - Return a tuple (node_dir, remaining_path) - """ - return (caldav_node.node_database(context=ncontext), uri) + def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None): + if dbro is None: + dbro = self.browse(cr, uid, ids, context=context) + + if dbro.calendar_collection: + if dynamic: + return caldav_node.node_calendar_res_col + else: + return caldav_node.node_calendar_collection + else: + return super(calendar_collection, self).\ + get_node_class(cr, uid, ids, dbro=dbro,dynamic=dynamic, + context=context) def get_description(self, cr, uid, ids, context=None): #TODO : return description of all calendars diff --git a/addons/caldav/doc/Path discovery.rst b/addons/caldav/doc/Path discovery.rst new file mode 100644 index 00000000000..d2d434b5fb6 --- /dev/null +++ b/addons/caldav/doc/Path discovery.rst @@ -0,0 +1,43 @@ +=============================== +Discovery of calendar resources +=============================== + +1. Srv record +-------------- +Calendar server and port should be advertised by a DNS _srv record. +Although this is beyond the capabilities of the OpenERP server, an +example setup is listed below: + -- TODO -- + +DNS -> http://our-host-ip:port/ + +2. Well-known uris +------------------- +The OpenERP server may have the 'well-known URIs' servlet activated, +which means that it will advertise its main database and the correct +location of the main CalDAV resource. +http://our-host-ip:port/.well-known/caldav -> http://our-host-ip:port/webdav/dbname/calendars/ + + +3. Caldav collection +--------------------- +The CalDAV "collection" is not necessarily a calendar or a folder just +containing calendars under it. It is a DAV resource (aka folder) which +has special DAV properties, so that clients are redirected to the right +urls (like per-user calendars etc.). + +http://our-host-ip:port/webdav/dbname/calendars/ -> http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/ + +4. Calendar home for user +-------------------------- +There can be one dynamic folder per user, which will in turn contain the calendars + +http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/ -> +http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/[Meetings, Tasks] + +5. Calendars +-------------- +Each calendar will contain the resource nodes: + .../c/Meetings/ -> .../c/Meetings/123.ics + +Principal url diff --git a/addons/caldav/doc/iPhone.rst b/addons/caldav/doc/iPhone.rst new file mode 100644 index 00000000000..4a3af7724d2 --- /dev/null +++ b/addons/caldav/doc/iPhone.rst @@ -0,0 +1,97 @@ +========================== +CalDAV with iPhone How-To +========================== + +As from OpenERP v6.0, document_webdav v2.2, the iPhone has been thoroughly +tested and supported as a Calendaring client for the OpenERP CalDAV module. + +However, keep in mind that OpenERP is not a straightforward calendaring +server, but an ERP application (with more data + structure) which exposes +that data to calendar clients. That said, the full features that would be +accessible through the Gtk or Web OpenERP clients cannot be crammed into +the Calendar clients (such as the iPhone). + +OpenERP server Setup +-------------------- +Some modules need to be installed at the OpenERP server. These are: + - caldav: Required, has the reference setup and the necessary + underlying code. Will also cause document, document_webdav + to be installed. + - crm_caldav: Optional, will export the CRM Meetings as a calendar. + - project_caldav: Optional, will export project tasks as calendar. + - http_well_known: Optional, experimental. Will ease bootstrapping, + but only when a DNS srv record is also used. + +These will also install a reference setup of the folders, ready to go. +The administrator of OpenERP can add more calendars and structure, if +needed. + +DNS server setup +------------------ +To be documented. + +SSL setup +---------- +It is highly advisable that you also setup SSL to work for the OpenERP +server. HTTPS is a server-wide feature in OpenERP, which means a +certificate will be set at the openerp-server.conf and will be the same +for XML-RPC, HTTP, WebDAV and CalDAV. +The iPhone also supports secure connections with SSL, although it does +not expect a self-signed certificate (or one that is not verified by +one of the "big" certificate authorities [1] ). + +Phone setup +------------- +The iPhone is fairly easy to setup. +IF you need SSL (and your certificate is not a verified one, as usual), +then you first will need to let the iPhone trust that. Follow these +steps: + s1. Open Safari and enter the https location of the OpenERP server: + https://my.server.ip:8071/ + (assuming you have the server at "my.server.ip" and the HTTPS port + is the default 8071) + s2. Safari will try to connect and issue a warning about the certificate + used. Inspect the certificate and click "Accept" so that iPhone + now trusts it. + +Now, to setup the calendars, you need to: +1. Click on the "Settings" and go to the "Mail, Contacts, Calendars" page. +2. Go to "Add account..." +3. Click on "Other" +4. From the "Calendars" group, select "Add CalDAV Account" +5. Enter the server's name or IP address at the "Server" entry, the + OpenERP username and password at the next ones. + As a description, you can either leave the server's name or + something like "OpenERP calendars". +6. You _will_ get the "Unable to verify account" error message. That is + because our server is not at the port iPhone expects[2]. But no + need to worry, click OK. +7. At the next page, enter the "Advanced Settings" to specify the right + ports and paths +8. If you have SSL, turn the switch on. Note that port will be changed + to 8443. +9. Specify the port for the OpenERP server: 8071 for SSL, 8069 without. +10. Set the "Account URL" to the right path of the OpenERP webdav: + https://my.server.ip:8071/webdav/dbname/calendars + Where "https://my.server.ip:8071" is the protocol, server name + and port as discussed above, "dbname" is the name of the database. + [Note that the default + "https://my.server.ip:8071/principals/users/username" might also + be edited to + "https://my.server.ip:8071/webdav/dbname/principals/users/username" ] +11. Click on Done. The phone will hopefully connect to the OpenERP server + and verify it can use the account. +12. Go to the main menu of the iPhone and enter the Calendar application. + Your OpenERP calendars will be visible inside the selection of the + "Calendars" button. + Note that when creating a new calendar entry, you will have to specify + which calendar it should be saved at. + + + + +[1] I remember one guy that made *lots* of money selling his CA business +off, and since then uses this money to create a software monopoly. +[2] This may not happen if the SRV records at DNS and the well-known URIs +are setup right. But we appreciate that a default OpenERP installation will +not have the DNS server of the company's domain configured. diff --git a/addons/caldav/orm_utils.py b/addons/caldav/orm_utils.py new file mode 100644 index 00000000000..ab0b4bbb8db --- /dev/null +++ b/addons/caldav/orm_utils.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2010 OpenERP SA (www.openerp.com) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + + +if True: # we need this indentation level ;) + + def get_last_modified(self, cr, user, args, context=None, access_rights_uid=None): + """Return the last modification date of objects in 'domain' + This function has similar semantics to orm.search(), apart from the + limit, offset and order arguments, which make no sense here. + It is useful when we want to find if the table (aka set of records) + has any modifications we should update at the client. + """ + if context is None: + context = {} + self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', context=context) + + query = self._where_calc(cr, user, args, context=context) + self._apply_ir_rules(cr, user, query, 'read', context=context) + from_clause, where_clause, where_clause_params = query.get_sql() + + where_str = where_clause and (" WHERE %s" % where_clause) or '' + + cr.execute('SELECT MAX(COALESCE("%s".write_date, "%s".create_date)) FROM ' % (self._table, self._table) + + from_clause + where_str , + where_clause_params) + res = cr.fetchall() + return res[0][0] + +#eof diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv index bb16603b904..ce3f3c90e32 100644 --- a/addons/caldav/security/ir.model.access.csv +++ b/addons/caldav/security/ir.model.access.csv @@ -3,3 +3,4 @@ "access_basic_calendar_attributes","basic.calendar.attributes","model_basic_calendar_attributes","base.group_user",1,1,1,1 "access_basic_calendar_fields","basic.calendar.fields","model_basic_calendar_fields","base.group_user",1,1,1,1 "access_basic_calendar","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1 +"access_basic_calendar_alias","basic.calendar.alias","model_basic_calendar_alias","base.group_user",1,1,1,1 diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py index ea90686b347..0a55f8b4fbe 100644 --- a/addons/caldav/wizard/calendar_event_export.py +++ b/addons/caldav/wizard/calendar_event_export.py @@ -37,8 +37,11 @@ class calendar_event_export(osv.osv_memory): """ Get Default value for Name field. """ - if not context: + if context is None: context = {} + else: + context= context.copy() + context['uid'] = uid model = context.get('model', 'basic.calendar') model_obj = self.pool.get(model) res = super(calendar_event_export, self).default_get( cr, uid, fields, context=context) diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py index 875e48d7d47..11f9f9b4afb 100644 --- a/addons/caldav/wizard/calendar_event_import.py +++ b/addons/caldav/wizard/calendar_event_import.py @@ -42,6 +42,11 @@ class calendar_event_import(osv.osv_memory): @param ids: List of calendar event import’s IDs @return: dictionary of calendar evet import window with Import successful msg. """ + if context is None: + context = {} + else: + context = context.copy() + context['uid'] = uid for data in self.read(cr, uid, ids): model = data.get('model', 'basic.calendar') diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py index de673b5d7c0..f8dc7614507 100644 --- a/addons/caldav/wizard/calendar_event_subscribe.py +++ b/addons/caldav/wizard/calendar_event_subscribe.py @@ -44,6 +44,12 @@ class calendar_event_subscribe(osv.osv_memory): @return: dictionary of calendar evet subscribe window with Import successful msg. """ global cnt + if context is None: + context = {} + else: + context = context.copy() + context['uid'] = uid + for data in self.read(cr, uid, ids): try: f = urllib.urlopen(data['url_path']) diff --git a/addons/claim_from_delivery/i18n/sr.po b/addons/claim_from_delivery/i18n/sr.po new file mode 100644 index 00000000000..f183e128f7e --- /dev/null +++ b/addons/claim_from_delivery/i18n/sr.po @@ -0,0 +1,60 @@ +# Serbian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-08-20 12:02+0000\n" +"PO-Revision-Date: 2010-10-17 07:56+0000\n" +"Last-Translator: OpenERP Administrators \n" +"Language-Team: Serbian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-10-18 04:56+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: claim_from_delivery +#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery +msgid "Claim" +msgstr "Zahtev" + +#. module: claim_from_delivery +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Nevažeći XML za pregled arhitekture" + +#. module: claim_from_delivery +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !" + +#. module: claim_from_delivery +#: model:ir.module.module,description:claim_from_delivery.module_meta_information +msgid "Create Claim from delivery order:\n" +msgstr "Kreiraj Zahtev iz Naloga Isporuke\n" + +#. module: claim_from_delivery +#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information +msgid "Claim from delivery" +msgstr "Zahtev od Isporuke" + +#. module: claim_from_delivery +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Pogrešno ime modela u definiciji akcije." + +#. module: claim_from_delivery +#: model:ir.model,name:claim_from_delivery.model_stock_picking +msgid "Picking List" +msgstr "Izborna Lista" + +#. module: claim_from_delivery +#: field:stock.picking,partner_id:0 +msgid "Partner" +msgstr "Partner" diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index 72368d1413a..79dadadbcd0 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -159,6 +159,5 @@ sequence="1" id="menu_board_crm" icon="terp-graph" groups="base.group_sale_salesman"/> - diff --git a/addons/crm/crm.py b/addons/crm/crm.py index d6194254c65..c809857de66 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -322,11 +322,7 @@ class crm_case(object): 'active': True}) self._action(cr, uid, cases, 'cancel') for case in cases: - message = "The " + self._description + " '" + case.name + "' has been Cancelled." - #TODO: Need to differentiate lead and opportunity -# if hasattr(case, 'type'): -# #TO CHECK: hasattr gives warning for other crm objects that don't have field 'type' -# message = "The " + (case.type or 'Case').title() + " '" + case.name + "' has been Cancelled." + message = _("The case '%s' has been cancelled.") % (case.name,) self.log(cr, uid, case.id, message) return True diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 23b1af57b28..6a113a42c2a 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -197,10 +197,14 @@ class crm_lead(crm_case, osv.osv): value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')}) self.write(cr, uid, ids, value) - for (id, name) in self.name_get(cr, uid, ids): - type = self.browse(cr, uid, id).type or 'Lead' - message = (_('The ') + type.title()) + " '" + name + "' "+ _("has been Opened.") - self.log(cr, uid, id, message) + for case in self.browse(cr, uid, ids): + if case.type == 'lead': + message = _("The lead '%s' has been opened.") % case.name + elif case.type == 'opportunity': + message = _("The opportunity '%s' has been opened.") % case.name + else: + message = _("The case '%s' has been opened.") % case.name + self.log(cr, uid, case.id, message) return res def case_close(self, cr, uid, ids, *args): @@ -213,11 +217,14 @@ class crm_lead(crm_case, osv.osv): """ res = super(crm_lead, self).case_close(cr, uid, ids, args) self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}) - for (id, name) in self.name_get(cr, uid, ids): - lead = self.browse(cr, uid, id) - if lead.type == 'lead': - message = _('The Lead') + " '" + name + "' "+ _("has been Closed.") - self.log(cr, uid, id, message) + for case in self.browse(cr, uid, ids): + if case.type == 'lead': + message = _("The lead '%s' has been closed.") % case.name + elif case.type == 'opportunity': + message = _("The opportunity '%s' has been closed.") % case.name + else: + message = _("The case '%s' has been closed.") % case.name + self.log(cr, uid, case.id, message) return res def convert_opportunity(self, cr, uid, ids, context=None): @@ -315,8 +322,6 @@ class crm_lead(crm_case, osv.osv): vals.update(res) res = self.create(cr, uid, vals, context) - message = _('A Lead created') + " '" + subject + "' " + _("from Mailgate.") - self.log(cr, uid, res, message) attachents = msg.get('attachments', []) for attactment in attachents or []: data_attach = { diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index b26dcc29f41..a92a36aba33 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -10,7 +10,7 @@ {'search_default_current':1, 'default_type': 'lead', 'search_default_section_id': section_id} - A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities. + 'Leads' allows you to manage and keep track of all first potential interests of a partner in one of your products or services. A lead is a first, unqualified, contact with a prospect or customer. After being qualified, a lead can be converted into a business opportunity with the creation of the related partner for further detailed tracking of any linked activities. You can use leads when you import a database of prospects or to integrate your website's contact form with OpenERP. diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 99ebcf63592..fb45e8a7b1b 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -11,6 +11,7 @@ [('object_id.model', '=', 'crm.lead')] {'object_id':'crm.lead'} + Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their leads and sales opportunities. It will allow them to easily track how is positioned a specific lead or opportunity in the sales cycle. form [('object_id.model', '=', 'crm.lead')] + Create specific categories that fit your company's activities in order to better classify and analyse them after they have been maintained in your leads and opportunities. You can use categories to reflect your product structure or the different types of sales you do. {"search_default_user_id":uid, 'search_default_section_id': section_id} - The calendar of meetings is shared between sales teams and fully integrated with the others applications like the employee holidays. You can also synchronize meetings with your mobile phone using the caldav interface. + The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface. @@ -106,6 +106,7 @@ [('ref','like','crm.meeting,')] {"search_default_toreview":1, "search_default_user_id":uid} + 'Meeting Invitations' allows you to create and manage the meeting invitations sent/to be sent to your colleagues/partners. [('object_id.model', '=', 'crm.meeting')] {'object_id':'crm.meeting'} + Create different meeting categories to better organize and classify your meetings. {'search_default_user_id':uid,'search_default_current':1, 'search_default_section_id':section_id,'default_type': 'opportunity'} - Opportunities allows you to track your best deals pipeline: history of -the communication, expected revenues, stage of each opportunity, -excepted closings, etc. Opportunities are usually connected with the -email gateway: new emails may create opportunities and each opportunity -automatically gets the history of the conversation with the customer. + Opportunities allows you to manage and keep track of your sales pipeline by creating specific customer or prospect related sales documents in order to follow up potential sales. Information such as the expected revenue, opportunity stage, expected closing date, communication history and so on can be maintained in them. Opportunities can be connected with the email gateway: new emails create opportunities, each of them automatically gets the history of the conversation with the customer. -Your teams will be able to plan meeting and phonecalls from -opportunities, to convert opportunities into quotations, to manage -documents related to the opportunity, to track all activities related to -this customer, etc. +You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more. diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index 5bb55a2320d..644d12cfc77 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -76,6 +76,9 @@