From c0d302ae0ec245477c7e1c74ffda63e92549a9cf Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Fri, 1 Mar 2013 12:07:30 +0100 Subject: [PATCH 01/89] [FIX] ir.model: uninstall should not drop LOG_ACCESS_COLUMNS columns. bzr revid: vmt@openerp.com-20130301110730-8mlnj9emjo3ifdq1 --- openerp/addons/base/ir/ir_model.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index 5927b500a0f..c03d6cfaf78 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -1060,6 +1060,14 @@ class ir_model_data(osv.osv): if set(external_ids)-ids_set: # if other modules have defined this record, we must not delete it continue + if model == 'ir.model.fields': + # Don't remove the LOG_ACCESS_COLUMNS unless _log_access + # has been turned off on the model. + field = self.pool.get(model).browse(cr, uid, [res_id], context=context)[0] + if field.name in openerp.osv.orm.LOG_ACCESS_COLUMNS and self.pool[field.model]._log_access: + continue + if field.name == 'id': + continue _logger.info('Deleting %s@%s', res_id, model) try: cr.execute('SAVEPOINT record_unlink_save') From f08bf5a08e67af086a26b51e67c69bd253155a38 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 4 Mar 2013 14:53:29 +0100 Subject: [PATCH 02/89] [FIX] Generates journal items immediately from expense bzr revid: jco@openerp.com-20130304135329-v1dfw564svd0zv7q --- addons/hr_expense/hr_expense.py | 301 ++++++++++++++++++++++ addons/hr_expense/hr_expense_workflow.xml | 2 +- 2 files changed, 302 insertions(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index f32479c2ae2..03475c90b04 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -145,6 +145,307 @@ class hr_expense_expense(osv.osv): def expense_canceled(self, cr, uid, ids, context=None): return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context) + + def account_move_get(self, cr, uid, expense_id, journal_id, context=None): + ''' + This method prepare the creation of the account move related to the given expense. + + :param expense_id: Id of voucher for which we are creating account_move. + :return: mapping between fieldname and value of account move to create + :rtype: dict + ''' + + + #Search for the period corresponding with confirmation date + expense_brw = self.browse(cr,uid,expense_id,context) + period_obj = self.pool.get('account.period') + company_id = expense_brw.company_id.id + ctx = context + ctx.update({'company_id': company_id}) + date = expense_brw.date_confirm + pids = period_obj.find(cr, uid, date, context=ctx) + try: + period_id = pids[0] + except: + raise osv.except_osv(_('Error! '), + _('Please define periods!')) + period = period_obj.browse(cr, uid, period_id, context=context) + + seq_obj = self.pool.get('ir.sequence') + + journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context) + if journal.sequence_id: + if not journal.sequence_id.active: + raise osv.except_osv(_('Configuration Error !'), + _('Please activate the sequence of selected journal !')) + c = dict(context) + c.update({'fiscalyear_id': period.fiscalyear_id.id}) + name = seq_obj.next_by_id(cr, uid, journal.sequence_id.id, context=c) + else: + raise osv.except_osv(_('Error!'), + _('Please define a sequence on the journal.')) + #Look for the next expense number + ref = seq_obj.get(cr, uid, 'hr.expense.invoice') + + move = { + 'name': name, + 'journal_id': journal_id, + 'narration': '', + 'date': expense_brw.date_confirm, + 'ref': ref, + 'period_id': period_id, + } + return move + + def line_get_convert(self, cr, uid, x, part, date, context=None): + return { + 'date_maturity': x.get('date_maturity', False), + 'partner_id': part.id, + 'name': x['name'][:64], + 'date': date, + 'debit': x['price']>0 and x['price'], + 'credit': x['price']<0 and -x['price'], + 'account_id': x['account_id'], + 'analytic_lines': x.get('analytic_lines', False), + 'amount_currency': x['price']>0 and abs(x.get('amount_currency', False)) or -abs(x.get('amount_currency', False)), + 'currency_id': x.get('currency_id', False), + 'tax_code_id': x.get('tax_code_id', False), + 'tax_amount': x.get('tax_amount', False), + 'ref': x.get('ref', False), + 'quantity': x.get('quantity',1.00), + 'product_id': x.get('product_id', False), + 'product_uom_id': x.get('uos_id', False), + 'analytic_account_id': x.get('account_analytic_id', False), + } + + def compute_expense_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines, context=None): + if context is None: + context={} + total = 0 + total_currency = 0 + cur_obj = self.pool.get('res.currency') + for i in invoice_move_lines: + if inv.currency_id.id != company_currency: + context.update({'date': inv.date_confirm or time.strftime('%Y-%m-%d')}) + i['currency_id'] = inv.currency_id.id + i['amount_currency'] = i['price'] + i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id, + company_currency, i['price'], + context=context) + else: + i['amount_currency'] = False + i['currency_id'] = False + i['ref'] = ref + total -= i['price'] + total_currency -= i['amount_currency'] or i['price'] + return total, total_currency, invoice_move_lines + + + def action_move_create(self, cr, uid, ids, context=None): + property_obj = self.pool.get('ir.property') + sequence_obj = self.pool.get('ir.sequence') + analytic_journal_obj = self.pool.get('account.analytic.journal') + account_journal = self.pool.get('account.journal') + voucher_obj = self.pool.get('account.voucher') + currency_obj = self.pool.get('res.currency') + ait_obj = self.pool.get('account.invoice.tax') + move_obj = self.pool.get('account.move') + if context is None: + context = {} + for exp in self.browse(cr, uid, ids, context=context): + company_id = exp.company_id.id + lines = [] + total = 0.0 + ctx = context.copy() + ctx.update({'date': exp.date}) + journal = False + if exp.journal_id: + journal = exp.journal_id + else: + journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id}) + if journal_id: + journal = account_journal.browse(cr, uid, journal_id, context=context) + if not journal: + raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured.")) + if not journal.sequence_id: + raise osv.except_osv(_('Error!'), _('Please define sequence on the journal related to this invoice.')) + company_currency = exp.company_id.currency_id.id + current_currency = exp.currency_id +# for line in exp.line_ids: +# if line.product_id: +# acc = line.product_id.property_account_expense +# if not acc: +# acc = line.product_id.categ_id.property_account_expense_categ +# else: +# acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id}) +# if not acc: +# raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.')) +# total_amount = line.total_amount +# if journal.currency: +# if exp.currency_id != journal.currency: +# total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx) +# elif exp.currency_id != exp.company_id.currency_id: +# total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx) +# lines.append((0, False, { +# 'name': line.name, +# 'account_id': acc.id, +# 'account_analytic_id': line.analytic_account.id, +# 'amount': total_amount, +# 'type': 'dr' +# })) +# total += total_amount + if not exp.employee_id.address_home_id: + raise osv.except_osv(_('Error!'), _('The employee must have a home address.')) + acc = exp.employee_id.address_home_id.property_account_payable.id + + #From action_move_line_create of voucher + move_id = move_obj.create(cr, uid, self.account_move_get(cr, uid, exp.id, journal.id, context=context), context=context) + move = move_obj.browse(cr, uid, move_id, context=context) + #iml = self._get_analytic_lines + + # within: iml = self.pool.get('account.invoice.line').move_line_get + iml = self.move_line_get(cr, uid, exp.id, context=context) + + #Write taxes on the lines which should automatically add the necessary extra lines upon creation + + + + diff_currency_p = exp.currency_id.id <> company_currency + # create one move line for the total + total = 0 + total_currency = 0 + total, total_currency, iml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, iml, context=ctx) + + + #Need to have counterline: + + iml.append({ + 'type':'dest', + 'name':'/', + 'price':total, + 'account_id': acc, + 'date_maturity': exp.date_confirm, + 'amount_currency': diff_currency_p and total_currency or False, + 'currency_id': diff_currency_p and exp.currency_id.id or False, + 'ref': exp.name + }) + + line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.user_id.partner_id, exp.date_confirm, context=ctx)),iml) + move_obj.write(cr, uid, [move_id], {'line_id':line}, context=ctx) + self.write(cr, uid, ids, {'account_move_id':move_id, 'state':'done'}, context=context) + + + #compute_taxes = ait_obj.compute(cr, uid, , context=context) + + + +# return { +# 'type':'src', +# 'name':line.name.split('\n')[0][:64], +# 'price_unit':line.price_unit, +# '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, +# 'taxes':line.invoice_line_tax_id} + + + def move_line_get(self, cr, uid, expense_id, context=None): + res = [] + tax_obj = self.pool.get('account.tax') + cur_obj = self.pool.get('res.currency') + if context is None: + context = {} + exp = self.browse(cr, uid, expense_id, context=context) + company_currency = exp.company_id.currency_id.id + + for line in exp.line_ids: + mres = self.move_line_get_item(cr, uid, line, context) + if not mres: + continue + res.append(mres) + tax_code_found= False + + #Calculate tax according to default tax on product + + #Taken from product_id_onchange in account.invoice + if line.product_id: + fposition_id = False + fpos_obj = self.pool.get('account.fiscal.position') + fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False + product = line.product_id + taxes = product.supplier_taxes_id + #If taxes are not related to the product, maybe they are in the account + if not taxes: + a = product.property_account_expense.id #Why is not there a check here? + if not a: + a = product.categ_id.property_account_expense_categ.id + a = fpos_obj.map_account(cr, uid, fpos, a) + taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False + tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) + #Calculating tax on the line and creating move? + for tax in tax_obj.compute_all(cr, uid, taxes, + line.unit_amount , + line.unit_quantity, line.product_id, + exp.user_id.partner_id)['taxes']: + tax_code_id = tax['base_code_id'] + tax_amount = line.total_amount * tax['base_sign'] + if tax_code_found: + if not tax_code_id: + continue + res.append(self.move_line_get_item(cr, uid, line, context)) + res[-1]['price'] = 0.0 + res[-1]['account_analytic_id'] = False + elif not tax_code_id: + continue + tax_code_found = True + res[-1]['tax_code_id'] = tax_code_id + res[-1]['tax_amount'] = cur_obj.compute(cr, uid, exp.currency_id.id, company_currency, tax_amount, context={'date': exp.date_confirm}) + + #Will create the tax here as we don't have the access + assoc_tax = { + 'type':'tax', + 'name':tax['name'], + 'price_unit': tax['price_unit'], + 'quantity': 1, + 'price': tax['amount'] * tax['base_sign'] or 0.0, + 'account_id': tax['account_collected_id'], + 'tax_code_id': tax['tax_code_id'], + 'tax_amount': tax['amount'] * tax['base_sign'], + } + res.append(assoc_tax) + return res + + def move_line_get_item(self, cr, uid, line, context=None): + company = line.expense_id.company_id + property_obj = self.pool.get('ir.property') + if line.product_id: + acc = line.product_id.property_account_expense + if not acc: + acc = line.product_id.categ_id.property_account_expense_categ + else: + acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company.id}) + if not acc: + raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.')) + return { + 'type':'src', + 'name': line.name.split('\n')[0][:64], + 'price_unit':line.unit_amount, + 'quantity':line.unit_quantity, + 'price':line.total_amount, + 'account_id':acc.id, + 'product_id':line.product_id.id, + 'uos_id':line.uom_id.id, + 'account_analytic_id':line.analytic_account.id, + #'taxes':line.invoice_line_tax_id, + } + + + + + def action_receipt_create(self, cr, uid, ids, context=None): property_obj = self.pool.get('ir.property') sequence_obj = self.pool.get('ir.sequence') diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml index 2e085071207..c01bb4cd14b 100644 --- a/addons/hr_expense/hr_expense_workflow.xml +++ b/addons/hr_expense/hr_expense_workflow.xml @@ -43,7 +43,7 @@ done function - action_receipt_create() + action_move_create() From 1e3725b9e6cc0f167dd3000844dc3d13e64dff98 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 4 Mar 2013 15:47:22 +0100 Subject: [PATCH 03/89] [FIX] adjust tests and no taxes when product not available bzr revid: jco@openerp.com-20130304144722-y30nkmmd8hyby7x0 --- addons/hr_expense/hr_expense.py | 2 ++ addons/hr_expense/test/expense_process.yml | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 03475c90b04..fb8af6649de 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -385,6 +385,8 @@ class hr_expense_expense(osv.osv): a = fpos_obj.map_account(cr, uid, fpos, a) taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) + else: + taxes = [] #Calculating tax on the line and creating move? for tax in tax_obj.compute_all(cr, uid, taxes, line.unit_amount , diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml index eae63c460fc..4b65c16e8ea 100644 --- a/addons/hr_expense/test/expense_process.yml +++ b/addons/hr_expense/test/expense_process.yml @@ -26,11 +26,6 @@ !python {model: hr.expense.expense}: | sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context) assert sep_expenses.state == 'done', "Expense should be in 'Done' state." - assert sep_expenses.voucher_id, "Expense should have link of Purchase Receipt." - assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt." - assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total." - assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Receipt and expense line are not correspond." - - I duplicate the expenses and cancel duplicated. - From 804bc3a916916eb5c32ef44e8bc5b5f37c89078d Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Mon, 4 Mar 2013 16:55:50 +0100 Subject: [PATCH 04/89] [FIX] in case of no taxes bzr revid: jco@openerp.com-20130304155550-g5m12ryt6id0b3m3 --- addons/hr_expense/hr_expense.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index fb8af6649de..f61f8923411 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -306,9 +306,6 @@ class hr_expense_expense(osv.osv): # within: iml = self.pool.get('account.invoice.line').move_line_get iml = self.move_line_get(cr, uid, exp.id, context=context) - #Write taxes on the lines which should automatically add the necessary extra lines upon creation - - diff_currency_p = exp.currency_id.id <> company_currency # create one move line for the total @@ -385,7 +382,7 @@ class hr_expense_expense(osv.osv): a = fpos_obj.map_account(cr, uid, fpos, a) taxes = a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) - else: + if not taxes: taxes = [] #Calculating tax on the line and creating move? for tax in tax_obj.compute_all(cr, uid, taxes, From cdabf79cf27a08f8ecb63a0a94e7d13b9f05fc4e Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 6 Mar 2013 15:05:54 +0100 Subject: [PATCH 05/89] [REF] hr_expense, creation of accounting entries from hr.expense: a lot of code refactoring. Still a huge work to be done in order to factorize some code with other objects (like account.invoice, account.voucher, account.asset...) bzr revid: qdp-launchpad@openerp.com-20130306140554-fhs6fhkyb779t6re --- addons/account/account.py | 23 +++ addons/hr_expense/__openerp__.py | 2 +- addons/hr_expense/hr_expense.py | 264 ++++++-------------------- addons/hr_expense/hr_expense_view.xml | 1 + 4 files changed, 79 insertions(+), 211 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index acf27c42392..2aab34ff8ba 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1150,6 +1150,29 @@ class account_move(osv.osv): _description = "Account Entry" _order = 'id desc' + def account_move_prepare(self, cr, uid, journal_id, date=False, ref='', company_id=False, context=None): + ''' + Prepares and returns a dictionary of values, ready to be passed to create() based on the parameters received. + ''' + if not date: + date = fields.date.today() + period_obj = self.pool.get('account.period') + if not company_id: + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + company_id = user.company_id.id + if context is None: + context = {} + #put the company in context to find the good period + ctx = context.copy() + ctx.update({'company_id': company_id}) + return { + 'journal_id': journal_id, + 'date': date, + 'period_id': period_obj.find(cr, uid, date, context=ctx)[0], + 'ref': ref, + 'company_id': company_id, + } + def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): """ Returns a list of tupples containing id, name, as internally it is called {def name_get} diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index 516af7f9d27..1f4e7b42209 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'], - 'depends': ['hr', 'account_voucher'], + 'depends': ['hr', 'account_voucher, account_accountant'], 'data': [ 'security/ir.model.access.csv', 'hr_expense_data.xml', diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index f61f8923411..29570559c65 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -145,8 +145,7 @@ class hr_expense_expense(osv.osv): def expense_canceled(self, cr, uid, ids, context=None): return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context) - - def account_move_get(self, cr, uid, expense_id, journal_id, context=None): + def account_move_get(self, cr, uid, expense_id, context=None): ''' This method prepare the creation of the account move related to the given expense. @@ -154,53 +153,27 @@ class hr_expense_expense(osv.osv): :return: mapping between fieldname and value of account move to create :rtype: dict ''' - - - #Search for the period corresponding with confirmation date - expense_brw = self.browse(cr,uid,expense_id,context) - period_obj = self.pool.get('account.period') - company_id = expense_brw.company_id.id - ctx = context - ctx.update({'company_id': company_id}) - date = expense_brw.date_confirm - pids = period_obj.find(cr, uid, date, context=ctx) - try: - period_id = pids[0] - except: - raise osv.except_osv(_('Error! '), - _('Please define periods!')) - period = period_obj.browse(cr, uid, period_id, context=context) - - seq_obj = self.pool.get('ir.sequence') - - journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context) - if journal.sequence_id: - if not journal.sequence_id.active: - raise osv.except_osv(_('Configuration Error !'), - _('Please activate the sequence of selected journal !')) - c = dict(context) - c.update({'fiscalyear_id': period.fiscalyear_id.id}) - name = seq_obj.next_by_id(cr, uid, journal.sequence_id.id, context=c) + journal_obj = self.pool.get('account.journal') + expense = self.browse(cr, uid, expense_id, context=context) + company_id = expense.company_id.id + date = expense.date_confirm + ref = expense.name + journal_id = False + if expense.journal_id: + journal_id = expense.journal_id.id else: - raise osv.except_osv(_('Error!'), - _('Please define a sequence on the journal.')) - #Look for the next expense number - ref = seq_obj.get(cr, uid, 'hr.expense.invoice') - - move = { - 'name': name, - 'journal_id': journal_id, - 'narration': '', - 'date': expense_brw.date_confirm, - 'ref': ref, - 'period_id': period_id, - } - return move + journal_id = journal_obj.search(cr, uid, [('type', '=', 'purchase'), ('company_id', '=', company_id)]) + if not journal_id: + raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured.")) + journal_id = journal_id[0] + return self.pool.get('account_move').account_move_prepare(cr, uid, journal_id, date=date, ref=ref, company_id=company_id, context=context) def line_get_convert(self, cr, uid, x, part, date, context=None): + #partner_id = self.pool.get('res.partner')._find_partner(part) + partner_id = part.id return { 'date_maturity': x.get('date_maturity', False), - 'partner_id': part.id, + 'partner_id': partner_id, 'name': x['name'][:64], 'date': date, 'debit': x['price']>0 and x['price'], @@ -218,108 +191,65 @@ class hr_expense_expense(osv.osv): 'analytic_account_id': x.get('account_analytic_id', False), } - def compute_expense_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines, context=None): + def compute_expense_totals(self, cr, uid, exp, company_currency, ref, account_move_lines, context=None): + ''' + internal method used for computation of total amount of an expense in the company currency and + in the expense currency, given the account_move_lines that will be created. It also do some small + transformations at these account_move_lines (for multi-currency purposes) + + :param account_move_lines: list of dict + :rtype: tuple of 3 elements (a, b ,c) + a: total in company currency + b: total in hr.expense currency + c: account_move_lines potentially modified + ''' + cur_obj = self.pool.get('res.currency') if context is None: context={} - total = 0 - total_currency = 0 - cur_obj = self.pool.get('res.currency') - for i in invoice_move_lines: - if inv.currency_id.id != company_currency: - context.update({'date': inv.date_confirm or time.strftime('%Y-%m-%d')}) - i['currency_id'] = inv.currency_id.id + context.update({'date': exp.date_confirm or time.strftime('%Y-%m-%d')}) + total = 0.0 + total_currency = 0.0 + for i in account_move_lines: + if exp.currency_id.id != company_currency: + i['currency_id'] = exp.currency_id.id i['amount_currency'] = i['price'] - i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id, + i['price'] = cur_obj.compute(cr, uid, exp.currency_id.id, company_currency, i['price'], context=context) else: i['amount_currency'] = False i['currency_id'] = False - i['ref'] = ref total -= i['price'] total_currency -= i['amount_currency'] or i['price'] - return total, total_currency, invoice_move_lines + return total, total_currency, account_move_lines def action_move_create(self, cr, uid, ids, context=None): - property_obj = self.pool.get('ir.property') - sequence_obj = self.pool.get('ir.sequence') - analytic_journal_obj = self.pool.get('account.analytic.journal') - account_journal = self.pool.get('account.journal') - voucher_obj = self.pool.get('account.voucher') - currency_obj = self.pool.get('res.currency') - ait_obj = self.pool.get('account.invoice.tax') move_obj = self.pool.get('account.move') if context is None: context = {} for exp in self.browse(cr, uid, ids, context=context): - company_id = exp.company_id.id - lines = [] - total = 0.0 - ctx = context.copy() - ctx.update({'date': exp.date}) - journal = False - if exp.journal_id: - journal = exp.journal_id - else: - journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id}) - if journal_id: - journal = account_journal.browse(cr, uid, journal_id, context=context) - if not journal: - raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured.")) - if not journal.sequence_id: - raise osv.except_osv(_('Error!'), _('Please define sequence on the journal related to this invoice.')) - company_currency = exp.company_id.currency_id.id - current_currency = exp.currency_id -# for line in exp.line_ids: -# if line.product_id: -# acc = line.product_id.property_account_expense -# if not acc: -# acc = line.product_id.categ_id.property_account_expense_categ -# else: -# acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id}) -# if not acc: -# raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.')) -# total_amount = line.total_amount -# if journal.currency: -# if exp.currency_id != journal.currency: -# total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx) -# elif exp.currency_id != exp.company_id.currency_id: -# total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx) -# lines.append((0, False, { -# 'name': line.name, -# 'account_id': acc.id, -# 'account_analytic_id': line.analytic_account.id, -# 'amount': total_amount, -# 'type': 'dr' -# })) -# total += total_amount if not exp.employee_id.address_home_id: raise osv.except_osv(_('Error!'), _('The employee must have a home address.')) - acc = exp.employee_id.address_home_id.property_account_payable.id + company_currency = exp.company_id.currency_id.id + diff_currency_p = exp.currency_id.id <> company_currency - #From action_move_line_create of voucher - move_id = move_obj.create(cr, uid, self.account_move_get(cr, uid, exp.id, journal.id, context=context), context=context) - move = move_obj.browse(cr, uid, move_id, context=context) + #create the move that will contain the accounting entries + move_id = move_obj.create(cr, uid, self.account_move_get(cr, uid, exp.id, context=context), context=context) #iml = self._get_analytic_lines # within: iml = self.pool.get('account.invoice.line').move_line_get iml = self.move_line_get(cr, uid, exp.id, context=context) - - diff_currency_p = exp.currency_id.id <> company_currency # create one move line for the total - total = 0 - total_currency = 0 - total, total_currency, iml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, iml, context=ctx) - - - #Need to have counterline: + total, total_currency, iml = self.compute_expense_totals(cr, uid, exp, company_currency, exp.name, iml, context=context) + #counterline with the total on payable account for the employee + acc = exp.employee_id.address_home_id.property_account_payable.id iml.append({ - 'type':'dest', - 'name':'/', - 'price':total, + 'type': 'dest', + 'name': '/', + 'price': total, 'account_id': acc, 'date_maturity': exp.date_confirm, 'amount_currency': diff_currency_p and total_currency or False, @@ -327,27 +257,10 @@ class hr_expense_expense(osv.osv): 'ref': exp.name }) - line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.user_id.partner_id, exp.date_confirm, context=ctx)),iml) - move_obj.write(cr, uid, [move_id], {'line_id':line}, context=ctx) - self.write(cr, uid, ids, {'account_move_id':move_id, 'state':'done'}, context=context) - - - #compute_taxes = ait_obj.compute(cr, uid, , context=context) - - - -# return { -# 'type':'src', -# 'name':line.name.split('\n')[0][:64], -# 'price_unit':line.price_unit, -# '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, -# 'taxes':line.invoice_line_tax_id} - + lines = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, exp.user_id.partner_id, exp.date_confirm, context=context)),iml) + move_obj.write(cr, uid, [move_id], {'line_id': lines}, context=context) + self.write(cr, uid, ids, {'account_move_id': move_id, 'state': 'done'}, context=context) + return True def move_line_get(self, cr, uid, expense_id, context=None): res = [] @@ -442,80 +355,11 @@ class hr_expense_expense(osv.osv): } - - - def action_receipt_create(self, cr, uid, ids, context=None): - property_obj = self.pool.get('ir.property') - sequence_obj = self.pool.get('ir.sequence') - analytic_journal_obj = self.pool.get('account.analytic.journal') - account_journal = self.pool.get('account.journal') - voucher_obj = self.pool.get('account.voucher') - currency_obj = self.pool.get('res.currency') - wkf_service = netsvc.LocalService("workflow") - if context is None: - context = {} - for exp in self.browse(cr, uid, ids, context=context): - company_id = exp.company_id.id - lines = [] - total = 0.0 - ctx = context.copy() - ctx.update({'date': exp.date}) - journal = False - if exp.journal_id: - journal = exp.journal_id - else: - journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id}) - if journal_id: - journal = account_journal.browse(cr, uid, journal_id, context=context) - if not journal: - raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured.")) - for line in exp.line_ids: - if line.product_id: - acc = line.product_id.property_account_expense - if not acc: - acc = line.product_id.categ_id.property_account_expense_categ - else: - acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id}) - if not acc: - raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.')) - total_amount = line.total_amount - if journal.currency: - if exp.currency_id != journal.currency: - total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx) - elif exp.currency_id != exp.company_id.currency_id: - total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx) - lines.append((0, False, { - 'name': line.name, - 'account_id': acc.id, - 'account_analytic_id': line.analytic_account.id, - 'amount': total_amount, - 'type': 'dr' - })) - total += total_amount - if not exp.employee_id.address_home_id: - raise osv.except_osv(_('Error!'), _('The employee must have a home address.')) - acc = exp.employee_id.address_home_id.property_account_payable.id - voucher = { - 'name': exp.name or '/', - 'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'), - 'account_id': acc, - 'type': 'purchase', - 'partner_id': exp.employee_id.address_home_id.id, - 'company_id': company_id, - 'line_ids': lines, - 'amount': total, - 'journal_id': journal.id, - } - if journal and not journal.analytic_journal_id: - analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context) - if analytic_journal_ids: - account_journal.write(cr, uid, [journal.id], {'analytic_journal_id': analytic_journal_ids[0]}, context=context) - voucher_id = voucher_obj.create(cr, uid, voucher, context=context) - self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'done'}, context=context) - return True + raise osv.except_osv(_('Error!'), _('Deprecated function used')) def action_view_receipt(self, cr, uid, ids, context=None): + raise osv.except_osv(_('Error!'), _('Deprecated function used')) ''' This function returns an action that display existing receipt of given expense ids. ''' diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 0324388786f..cb1a7408a29 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -133,6 +133,7 @@ + From d448390cafeeeadc470d1c84d77252e53483bf50 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 6 Mar 2013 15:35:34 +0100 Subject: [PATCH 06/89] [FIX] hr_expense: mising coma in manifest bzr revid: qdp-launchpad@openerp.com-20130306143534-30vh1xl79eo6bf5c --- addons/hr_expense/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index 1f4e7b42209..8eb7de957f8 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'], - 'depends': ['hr', 'account_voucher, account_accountant'], + 'depends': ['hr', 'account_voucher', 'account_accountant'], 'data': [ 'security/ir.model.access.csv', 'hr_expense_data.xml', From ee72f0953aec63c1f5f5444541a9075e0f3c9c43 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 6 Mar 2013 15:38:37 +0100 Subject: [PATCH 07/89] [FIX] hr_expense: typo bzr revid: qdp-launchpad@openerp.com-20130306143837-gc7edztg71h5hi56 --- addons/hr_expense/hr_expense.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 29570559c65..9196cba3d96 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -166,7 +166,7 @@ class hr_expense_expense(osv.osv): if not journal_id: raise osv.except_osv(_('Error!'), _("No expense journal found. Please make sure you have a journal with type 'purchase' configured.")) journal_id = journal_id[0] - return self.pool.get('account_move').account_move_prepare(cr, uid, journal_id, date=date, ref=ref, company_id=company_id, context=context) + return self.pool.get('account.move').account_move_prepare(cr, uid, journal_id, date=date, ref=ref, company_id=company_id, context=context) def line_get_convert(self, cr, uid, x, part, date, context=None): #partner_id = self.pool.get('res.partner')._find_partner(part) From fd54f58ccb7802af3aa8eff580affb29dceb9874 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 6 Mar 2013 17:39:31 +0100 Subject: [PATCH 08/89] [IMP] hr_expense: now propose to open the account.move in form view thanks to a button in the expense form view bzr revid: qdp-launchpad@openerp.com-20130306163931-609cgn16xmcr0wot --- addons/hr_expense/hr_expense.py | 25 +++++++++++++------------ addons/hr_expense/hr_expense_view.xml | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 9196cba3d96..cd11d19ff17 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -145,6 +145,9 @@ class hr_expense_expense(osv.osv): def expense_canceled(self, cr, uid, ids, context=None): return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context) + def action_receipt_create(self, cr, uid, ids, context=None): + raise osv.except_osv(_('Error!'), _('Deprecated function used')) + def account_move_get(self, cr, uid, expense_id, context=None): ''' This method prepare the creation of the account move related to the given expense. @@ -354,28 +357,26 @@ class hr_expense_expense(osv.osv): #'taxes':line.invoice_line_tax_id, } - - def action_receipt_create(self, cr, uid, ids, context=None): - raise osv.except_osv(_('Error!'), _('Deprecated function used')) - - def action_view_receipt(self, cr, uid, ids, context=None): - raise osv.except_osv(_('Error!'), _('Deprecated function used')) + def action_view_move(self, cr, uid, ids, context=None): ''' - This function returns an action that display existing receipt of given expense ids. + This function returns an action that display existing account.move of given expense ids. ''' assert len(ids) == 1, 'This option should only be used for a single id at a time' voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id - res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form') + try: + dummy, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'view_move_form') + except: + view_id = False result = { - 'name': _('Expense Receipt'), + 'name': _('Expense Account Move'), 'view_type': 'form', 'view_mode': 'form', - 'view_id': res and res[1] or False, - 'res_model': 'account.voucher', + 'view_id': view_id, + 'res_model': 'account.move', 'type': 'ir.actions.act_window', 'nodestroy': True, 'target': 'current', - 'res_id': voucher_id, + 'res_id': account_move_id, } return result diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index cb1a7408a29..3ee97ba3a0e 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -67,7 +67,7 @@ - File + /web/binary/upload_attachment From f05aff8ac9e257ca8c79d58c544b48b39ce354cd Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 8 Mar 2013 11:48:50 +0100 Subject: [PATCH 20/89] [FIX]tools/mail: fix regex when sanitizing html containing mail address bzr revid: csn@openerp.com-20130308104850-02nfuaxdr91bo0nx --- openerp/tools/mail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py index 7ca9dd75bac..933c8927d2c 100644 --- a/openerp/tools/mail.py +++ b/openerp/tools/mail.py @@ -50,7 +50,7 @@ def html_sanitize(src): src = ustr(src, errors='replace') # html encode email tags - part = re.compile(r"(<[^<>]+@[^<>]+>)", re.IGNORECASE | re.DOTALL) + part = re.compile(r"(<(([^a<>]|a[^<>\s])[^<>]*)@[^<>]+>)", re.IGNORECASE | re.DOTALL) src = part.sub(lambda m: cgi.escape(m.group(1)), src) # some corner cases make the parser crash (such as in test_mail) From 22bba15ccd7ab709db9ed2c38a132273c9847e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 8 Mar 2013 13:43:41 +0100 Subject: [PATCH 21/89] [FIX] email_template: on_change values for m2m can be list of ids, not necessarily commands. bzr revid: tde@openerp.com-20130308124341-ih0f4us81cffer7m --- addons/email_template/wizard/mail_compose_message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index e9f539a22b2..9dad18e07f3 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -141,7 +141,7 @@ class mail_compose_message(osv.TransientModel): # legacy template behavior: void values do not erase existing values and the # related key is removed from the values dict if partner_ids: - values['partner_ids'] = [(6, 0, list(partner_ids))] + values['partner_ids'] = list(partner_ids) return values From 6dbb52267f514055f013207f7522f9d49dfd6110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 8 Mar 2013 13:47:24 +0100 Subject: [PATCH 22/89] [FIX] res_partner: notification_email_send help and selection values strings updated for cleaner explanations. bzr revid: tde@openerp.com-20130308124724-6tmb4w180sf32ktb --- addons/mail/res_partner.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index 218b5ae3cb7..6807c13a08a 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -30,13 +30,16 @@ class res_partner_mail(osv.Model): _columns = { 'notification_email_send': fields.selection([ - ('all', 'All feeds'), - ('comment', 'Comments and Emails'), - ('email', 'Emails only'), + ('all', 'All Messages (discussions, emails, followed system notifications)'), + ('comment', 'Incoming Emails and Discussions'), + ('email', 'Incoming Emails only'), ('none', 'Never') - ], 'Receive Feeds by Email', required=True, - help="Choose in which case you want to receive an email when you "\ - "receive new feeds."), + ], 'Receive Messages by Email', required=True, + help="Policy to receive emails for new notifications pushed to your Inbox. "\ + "'Never' prevents OpenERP from sending emails for notifications. "\ + "'Incoming Emails only' send an email when you receive an incoming email, such as customer replies. "\ + "'Incoming Emails and Discussions' sends emails for incoming emails along with user input. "\ + "'All Messages' also sends emails for notifications received for followed subtype, like stage changes, in addition to Incoming Emails and Discussions."), } _defaults = { From d130a05e8cf147ea983c42de588d3ac9c66e319a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 8 Mar 2013 13:47:53 +0100 Subject: [PATCH 23/89] [FIX] crm, email_template: opt_out parameter used only for mass mailing and marketing campaigns. Updated help accordingly. bzr revid: tde@openerp.com-20130308124753-dzt5e5nf7zpaq2dk --- addons/crm/crm_lead.py | 2 +- addons/email_template/res_partner.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index e8bba67e1ce..9b3697b8dc5 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -259,7 +259,7 @@ class crm_lead(base_stage, format_address, osv.osv): 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"), 'contact_name': fields.char('Contact Name', size=64), 'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1), - 'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."), + 'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign."), 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), diff --git a/addons/email_template/res_partner.py b/addons/email_template/res_partner.py index 987fca43219..bf730f37458 100644 --- a/addons/email_template/res_partner.py +++ b/addons/email_template/res_partner.py @@ -28,8 +28,8 @@ class res_partner(osv.osv): _inherit = 'res.partner' _columns = { - 'opt_out': fields.boolean('Opt-Out', help="If checked, this partner will not receive any automated email " \ - "notifications, such as the availability of invoices."), + 'opt_out': fields.boolean('Opt-Out', + help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign."), } _defaults = { From 6d78c2f2349ea64d5248644c559c34a0bdccd7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 8 Mar 2013 13:48:35 +0100 Subject: [PATCH 24/89] [FIX] res_partner: mail now adds forgotten notification_email_send field; otherwise partner manager are not able to change the email reception policy for partners that are not users. bzr revid: tde@openerp.com-20130308124835-sooyabgjhawjg7qr --- addons/mail/res_partner_view.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml index a4aa56ae971..7df5d27c9d0 100644 --- a/addons/mail/res_partner_view.xml +++ b/addons/mail/res_partner_view.xml @@ -7,6 +7,9 @@ res.partner + + +
From 16a89075e0cbfcb42bfe0e8c6ebbac2012b1097e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 8 Mar 2013 14:14:52 +0100 Subject: [PATCH 25/89] [FIX] FieldTextHtml: fixed quote error in parameter of cleditor, leading to font-family not taken into account. bzr revid: tde@openerp.com-20130308131452-8mmmpc6was3lfse8 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3ca546a9754..c8f7eaf032e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2662,7 +2662,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc "| removeformat | bullets numbering | outdent " + "indent | link unlink | source", bodyStyle: // style to assign to document body contained within the editor - "margin:4px; color:#4c4c4c; font-size:13px; font-family:\"Lucida Grande\",Helvetica,Verdana,Arial,sans-serif; cursor:text" + "margin:4px; color:#4c4c4c; font-size:13px; font-family:\'Lucida Grande\',Helvetica,Verdana,Arial,sans-serif; cursor:text" }); this.$cleditor = this.$textarea.cleditor()[0]; this.$cleditor.change(function() { From d79150eefacef9c9f78e16fb92a938e2a3b7cc71 Mon Sep 17 00:00:00 2001 From: Peter Langenberg Date: Fri, 8 Mar 2013 18:06:08 +0100 Subject: [PATCH 26/89] sometimes sequence of sales order lines wrong after save (most frequent using debian squeeze) lp bug: https://launchpad.net/bugs/1134365 fixed bzr revid: pl@agaplan.eu-20130308170608-3zlsrow4rnw2fcqi --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8e944691a1d..854c671fd74 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -717,7 +717,7 @@ class sale_order_line(osv.osv): 'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'), 'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } - _order = 'order_id desc, sequence' + _order = 'order_id desc, sequence, id' _defaults = { 'product_uom' : _get_uom_id, 'discount': 0.0, From 7310643b6b15e09db11de2ec38be007e37706936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 11 Mar 2013 12:46:23 +0100 Subject: [PATCH 27/89] [IMP] email: better reply_to that includes document name. bzr revid: tde@openerp.com-20130311114623-ftcj8s8rbahvjupz --- addons/mail/mail_mail.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 1b3ca152a9a..6219ace864f 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -21,6 +21,7 @@ import base64 import logging +import re from urllib import urlencode from urlparse import urljoin @@ -198,13 +199,27 @@ class mail_mail(osv.Model): :param browse_record mail: mail.mail browse_record :param browse_record partner: specific recipient partner """ + # TDE FIXME BEFORE MERGE: not sure the late change is interesting if mail.reply_to: return mail.reply_to - if not mail.model or not mail.res_id: - return False - if not hasattr(self.pool.get(mail.model), 'message_get_reply_to'): - return False - return self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0] + document_name = '' + email_reply_to = False + if mail.model and mail.res_id and hasattr(self.pool.get(mail.model), 'message_get_reply_to'): + email_reply_to = self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0] + + if not email_reply_to: + if mail.email_from: + match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from) # TDE TODO: simplify multiple same regex + if match: + email_reply_to = match.group(1) + + if email_reply_to: + if mail.model and mail.res_id: + document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0] + if document_name: + return 'Followers of %s <%s>' % (document_name[1], email_reply_to) + else: + return email_reply_to def send_get_email_dict(self, cr, uid, mail, partner=None, context=None): """ Return a dictionary for specific email values, depending on a From a2a8c238dcd04e683ef6d3f1051aaa9e432db89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 11 Mar 2013 13:42:54 +0100 Subject: [PATCH 28/89] [CLEAN] email_template: removed a print statement. bzr revid: tde@openerp.com-20130311124254-xzxs1r6cnqw2zxxc --- addons/email_template/wizard/mail_compose_message.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index 9dad18e07f3..255f93998a2 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -70,7 +70,6 @@ class mail_compose_message(osv.TransientModel): elif template_id: # FIXME odo: change the mail generation to avoid attachment duplication values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context) - print values.get('partner_ids') # transform attachments into attachment_ids values['attachment_ids'] = [] ir_attach_obj = self.pool.get('ir.attachment') From 6ae80a98acb524d0965658446a65bf5fd2a020d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 11 Mar 2013 13:49:14 +0100 Subject: [PATCH 29/89] [CLEAN] mail: cleaned code of modified reply_to. bzr revid: tde@openerp.com-20130311124914-xcdbgmw4w7nm02rv --- addons/mail/mail_mail.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 6219ace864f..1ca3255fd84 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -202,24 +202,26 @@ class mail_mail(osv.Model): # TDE FIXME BEFORE MERGE: not sure the late change is interesting if mail.reply_to: return mail.reply_to - document_name = '' email_reply_to = False + + # if model and res_id: try to use ``message_get_reply_to`` that returns the document alias if mail.model and mail.res_id and hasattr(self.pool.get(mail.model), 'message_get_reply_to'): email_reply_to = self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0] + # no alias reply_to -> reply_to will be the email_from, only the email part + if not email_reply_to and mail.email_from: + match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from) # TDE TODO: simplify multiple same regex + if match: + email_reply_to = match.group(1) - if not email_reply_to: - if mail.email_from: - match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from) # TDE TODO: simplify multiple same regex - if match: - email_reply_to = match.group(1) - + # format 'Document name ' if email_reply_to: + document_name = '' if mail.model and mail.res_id: document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0] if document_name: - return 'Followers of %s <%s>' % (document_name[1], email_reply_to) - else: - return email_reply_to + email_reply_to = 'Followers of %s <%s>' % (document_name[1], email_reply_to) + + return email_reply_to def send_get_email_dict(self, cr, uid, mail, partner=None, context=None): """ Return a dictionary for specific email values, depending on a From 459fce0150981269e668fda52001463269f58659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 11 Mar 2013 15:08:38 +0100 Subject: [PATCH 30/89] [CLEAN] Removed unnecessary quotes. As Teal'c said: Indeed. bzr revid: tde@openerp.com-20130311140838-g9pvncskvuibz1wm --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c8f7eaf032e..952a1c9d15f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2662,7 +2662,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc "| removeformat | bullets numbering | outdent " + "indent | link unlink | source", bodyStyle: // style to assign to document body contained within the editor - "margin:4px; color:#4c4c4c; font-size:13px; font-family:\'Lucida Grande\',Helvetica,Verdana,Arial,sans-serif; cursor:text" + "margin:4px; color:#4c4c4c; font-size:13px; font-family:'Lucida Grande',Helvetica,Verdana,Arial,sans-serif; cursor:text" }); this.$cleditor = this.$textarea.cleditor()[0]; this.$cleditor.change(function() { From 910f7097ba8278e329de236341f7e2e78293c0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 11:56:40 +0100 Subject: [PATCH 31/89] [IMP] res_partner: use tools.email_split instead of custom regex when parsing partner_name to find an email. bzr revid: tde@openerp.com-20130313105640-r53xueaz36zw3fjd --- openerp/addons/base/res/res_partner.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 4dce23b4d33..7c9fbf58c64 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -417,10 +417,10 @@ class res_partner(osv.osv, format_address): """ Supported syntax: - 'Raoul ': will find name and email address - otherwise: default, everything is set as the name """ - match = re.search(r'([^\s,<@]+@[^>\s,]+)', text) - if match: - email = match.group(1) - name = text[:text.index(email)].replace('"','').replace('<','').strip() + emails = tools.email_split(text) + if emails: + email = emails[0] + name = text[:text.index(email)].replace('"', '').replace('<', '').strip() else: name, email = text, '' return name, email From d49889c9a8575cdb31193770172e9de3bb1b3d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 12:17:46 +0100 Subject: [PATCH 32/89] [IMP] mail: res_partner: improved help for notification_email_send. bzr revid: tde@openerp.com-20130313111746-xfrd8kdhntb39gwl --- addons/mail/res_partner.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index 6807c13a08a..05f9fc2ace0 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -30,16 +30,16 @@ class res_partner_mail(osv.Model): _columns = { 'notification_email_send': fields.selection([ - ('all', 'All Messages (discussions, emails, followed system notifications)'), - ('comment', 'Incoming Emails and Discussions'), + ('none', 'Never'), ('email', 'Incoming Emails only'), - ('none', 'Never') + ('comment', 'Incoming Emails and Discussions'), + ('all', 'All Messages (discussions, emails, followed system notifications)'), ], 'Receive Messages by Email', required=True, - help="Policy to receive emails for new notifications pushed to your Inbox. "\ - "'Never' prevents OpenERP from sending emails for notifications. "\ - "'Incoming Emails only' send an email when you receive an incoming email, such as customer replies. "\ - "'Incoming Emails and Discussions' sends emails for incoming emails along with user input. "\ - "'All Messages' also sends emails for notifications received for followed subtype, like stage changes, in addition to Incoming Emails and Discussions."), + help="Policy to receive emails for new messages pushed to your personal Inbox:\n " + "- Never: no emails are sent" + "- Incoming Emails only: for messages received by the system via email" + "- Incoming Emails and Discussions: for incoming emails along with internal discussions" + "- All Messages: for every notification you receive in your Inbox"), } _defaults = { From 6b2c64ff4099a3ab7cb5f0643f20bda5943f3f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 12:19:26 +0100 Subject: [PATCH 33/89] [IMP] mail_mail: cleaned code about reply_to format: now uses tools.email_split, cleaned a bit the code. bzr revid: tde@openerp.com-20130313111926-45d9gct5nihr6f6n --- addons/mail/mail_mail.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 1ca3255fd84..7720df84f92 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -209,17 +209,15 @@ class mail_mail(osv.Model): email_reply_to = self.pool.get(mail.model).message_get_reply_to(cr, uid, [mail.res_id], context=context)[0] # no alias reply_to -> reply_to will be the email_from, only the email part if not email_reply_to and mail.email_from: - match = re.search(r'([^\s,<@]+@[^>\s,]+)', mail.email_from) # TDE TODO: simplify multiple same regex - if match: - email_reply_to = match.group(1) + emails = tools.email_split(mail.email_from) + if emails: + email_reply_to = emails[0] # format 'Document name ' - if email_reply_to: - document_name = '' - if mail.model and mail.res_id: - document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0] + if email_reply_to and mail.model and mail.res_id: + document_name = self.pool.get(mail.model).name_get(cr, SUPERUSER_ID, [mail.res_id], context=context)[0] if document_name: - email_reply_to = 'Followers of %s <%s>' % (document_name[1], email_reply_to) + email_reply_to = _('Followers of %s <%s>') % (document_name[1], email_reply_to) return email_reply_to From 2f4a59fd0652e1c5b76e5bd62826de084295c91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 12:20:13 +0100 Subject: [PATCH 34/89] [IMP] email_template, crm: added forgotten filters for opt-out; cleaned help of opt-out; email body is back into internal note as it has been decided that it was too much change for 7.0, especially that email content parsing is not robust enough. bzr revid: tde@openerp.com-20130313112013-veqzplextey1300p --- addons/crm/crm_lead.py | 6 +++++- addons/crm/crm_lead_view.xml | 2 ++ addons/email_template/res_partner.py | 5 +++-- addons/email_template/res_partner_view.xml | 12 ++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 9b3697b8dc5..7ab9f110a7b 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -259,7 +259,9 @@ class crm_lead(base_stage, format_address, osv.osv): 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"), 'contact_name': fields.char('Contact Name', size=64), 'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1), - 'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign."), + 'opt_out': fields.boolean('Opt-Out', oldname='optout', + help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. " + "Filter 'Available for Mass Mailing' allows users to filter the partners when performing mass mailing."), 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), @@ -977,8 +979,10 @@ class crm_lead(base_stage, format_address, osv.osv): """ if custom_values is None: custom_values = {} + desc = html2plaintext(msg.get('body')) if msg.get('body') else '' defaults = { 'name': msg.get('subject') or _("No Subject"), + 'description': desc, 'email_from': msg.get('from'), 'email_cc': msg.get('cc'), 'partner_id': msg.get('author_id', False), diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index df68f90aa57..39c9a5b98f5 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -341,6 +341,8 @@ + diff --git a/addons/email_template/res_partner.py b/addons/email_template/res_partner.py index bf730f37458..cb3ef67862f 100644 --- a/addons/email_template/res_partner.py +++ b/addons/email_template/res_partner.py @@ -19,7 +19,7 @@ # ############################################################################## -from openerp.osv import fields,osv +from openerp.osv import fields, osv class res_partner(osv.osv): """Inherit res.partner to add a generic opt-out field that can be used @@ -29,7 +29,8 @@ class res_partner(osv.osv): _columns = { 'opt_out': fields.boolean('Opt-Out', - help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign."), + help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. " + "Filter 'Available for Mass Mailing' allows users to filter the partners when performing mass mailing."), } _defaults = { diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml index 3d17120d69e..7e494bd5054 100644 --- a/addons/email_template/res_partner_view.xml +++ b/addons/email_template/res_partner_view.xml @@ -11,5 +11,17 @@ + + + res.partner.opt_out.search + res.partner + + + + + + + From fdf7410acffa269ee81ac7a0f03c3f9429b19e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 12:59:01 +0100 Subject: [PATCH 35/89] [FIX] crm, res_partner: added separator in search views after adding not opt-out filter. bzr revid: tde@openerp.com-20130313115901-s60j69qn3e3q4bpk --- addons/crm/crm_lead_view.xml | 3 ++- addons/email_template/res_partner_view.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 39c9a5b98f5..4c055ce1436 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -341,9 +341,10 @@ + - + diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml index 7e494bd5054..c6331ebf514 100644 --- a/addons/email_template/res_partner_view.xml +++ b/addons/email_template/res_partner_view.xml @@ -18,8 +18,9 @@ + + help="Leads that did not ask not to be included in mass mailing campaigns" /> From 3dc1a58ed5906212a52c376b62cff69d9ac4ec78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 13:12:21 +0100 Subject: [PATCH 36/89] [FIX] crm, email_template: fixed help messages talking about partners and leads instead of leads and partners... well, I think this comment is not very understandable, but at least there is a commit message. Horray. bzr revid: tde@openerp.com-20130313121221-lo0kmkt2lltyr94e --- addons/crm/crm_lead.py | 2 +- addons/email_template/res_partner_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 7ab9f110a7b..d0be688c8a5 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -261,7 +261,7 @@ class crm_lead(base_stage, format_address, osv.osv): 'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1), 'opt_out': fields.boolean('Opt-Out', oldname='optout', help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. " - "Filter 'Available for Mass Mailing' allows users to filter the partners when performing mass mailing."), + "Filter 'Available for Mass Mailing' allows users to filter the leads when performing mass mailing."), 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml index c6331ebf514..1da3681d3af 100644 --- a/addons/email_template/res_partner_view.xml +++ b/addons/email_template/res_partner_view.xml @@ -20,7 +20,7 @@ + help="Partners that did not ask not to be included in mass mailing campaigns" /> From ecd460e0d5a534af2a2536786b401c84267db40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 13:16:59 +0100 Subject: [PATCH 37/89] [IMP] email_template: improved help for email_from. bzr revid: tde@openerp.com-20130313121659-pvdy814zoq9zonf2 --- addons/email_template/email_template.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 280e44fa2fb..08ef3ec6e98 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -142,7 +142,9 @@ class email_template(osv.osv): help="If checked, the user's signature will be appended to the text version " "of the message"), 'subject': fields.char('Subject', translate=True, help="Subject (placeholders may be used here)",), - 'email_from': fields.char('From', help="Sender address (placeholders may be used here)"), + 'email_from': fields.char('From', + help="Sender address (placeholders may be used here). If not set, the default " + "value will be the author's email alias if configured, or email address."), 'email_to': fields.char('To (Emails)', help="Comma-separated recipient addresses (placeholders may be used here)"), 'email_recipients': fields.char('To (Partners)', help="Comma-separated ids of recipient partners (placeholders may be used here)"), 'email_cc': fields.char('Cc', help="Carbon copy recipients (placeholders may be used here)"), From 3b989b2c57f8aeb2d8bb92ec6338b862458d9641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 13 Mar 2013 13:26:32 +0100 Subject: [PATCH 38/89] [FIX] mail_message: fixed strings and names for read/unread filters. bzr revid: tde@openerp.com-20130313122632-bwsz0pss88z0ups2 --- addons/mail/mail_message_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 7d2e9483773..8f2fb3f1020 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -59,12 +59,12 @@ - - + Date: Wed, 13 Mar 2013 13:43:17 +0100 Subject: [PATCH 39/89] account: [FIX] Removes the unneeded second cancel button on supplier invoices bzr revid: cbi@openerp.com-20130313124317-4ug3gvlnocmc50ko --- addons/account/account_invoice_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 3d46ee8365a..8c7cec67ac5 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -146,7 +146,6 @@
From 1b8891dd955c3789754e9b2b450732097e0cbf1c Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 14 Mar 2013 11:30:17 +0100 Subject: [PATCH 57/89] [Revert]auth_signup: should be done here bzr revid: dle@openerp.com-20130314103017-g0dps4lx151unu6o --- addons/auth_signup/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml index 27559ea5198..be9942feac2 100644 --- a/addons/auth_signup/res_users_view.xml +++ b/addons/auth_signup/res_users_view.xml @@ -21,7 +21,7 @@
-
From dbed9bdb7586c14e3cf528cab7ac935c62a90a82 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 14 Mar 2013 11:34:20 +0100 Subject: [PATCH 58/89] [FIX] auth_signup: only automatically show signup if signup is enabled bzr revid: chs@openerp.com-20130314103420-tkr1wklrf85vux7o --- addons/auth_signup/static/src/js/auth_signup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index fe071fde55d..bbaf907c625 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -56,7 +56,7 @@ openerp.auth_signup = function(instance) { self.rpc("/auth_signup/get_config", {dbname: dbname}).done(function(result) { self.signup_enabled = result.signup; self.reset_password_enabled = result.reset_password; - if (self.$("form input[name=login]").val()){ + if (!self.signup_enabled || self.$("form input[name=login]").val()){ self.set('login_mode', 'default'); } else { self.set('login_mode', 'signup'); From 1bc43748ee85c95c49aa79a7f653f71d46408f7c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 14 Mar 2013 11:52:13 +0100 Subject: [PATCH 59/89] [ADD] `hide_breadcrumb` option bzr revid: fme@openerp.com-20130314105213-13dtn26c773qsu7a --- addons/web/static/src/js/views.js | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 1ba65f7ec18..7b2fc87aa97 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -149,6 +149,9 @@ instance.web.ActionManager = instance.web.Widget.extend({ for (var i = 0; i < this.breadcrumbs.length; i += 1) { var item = this.breadcrumbs[i]; var tit = item.get_title(); + if (item.hide_breadcrumb) { + continue; + } if (!_.isArray(tit)) { tit = [tit]; } @@ -282,6 +285,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ * @param {Object} [options] * @param {Boolean} [options.clear_breadcrumbs=false] Clear the breadcrumbs history list * @param {Function} [options.on_reverse_breadcrumb] Callback to be executed whenever an anterior breadcrumb item is clicked on. + * @param {Function} [options.hide_breadcrumb] Do not display this widget's title in the breadcrumb * @param {Function} [options.on_close] Callback to be executed when the dialog is closed (only relevant for target=new actions) * @param {Function} [options.action_menu_id] Manually set the menu id on the fly. * @param {Object} [options.additional_context] Additional context to be merged with the action's context. @@ -291,6 +295,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ options = _.defaults(options || {}, { clear_breadcrumbs: false, on_reverse_breadcrumb: function() {}, + hide_breadcrumb: false, on_close: function() {}, action_menu_id: null, additional_context: {}, @@ -403,7 +408,12 @@ instance.web.ActionManager = instance.web.Widget.extend({ widget: function () { return new instance.web.ViewManagerAction(self, action); }, action: action, klass: 'oe_act_window', - post_process: function (widget) { widget.add_breadcrumb(options.on_reverse_breadcrumb); } + post_process: function (widget) { + widget.add_breadcrumb({ + on_reverse_breadcrumb: options.on_reverse_breadcrumb, + hide_breadcrumb: options.hide_breadcrumb, + }); + }, }, options); }, ir_actions_client: function (action, options) { @@ -427,6 +437,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ widget: widget, title: action.name, on_reverse_breadcrumb: options.on_reverse_breadcrumb, + hide_breadcrumb: options.hide_breadcrumb, }); if (action.tag !== 'reload') { self.do_push_state({}); @@ -649,7 +660,15 @@ instance.web.ViewManager = instance.web.Widget.extend({ set_title: function(title) { this.$el.find('.oe_view_title_text:first').text(title); }, - add_breadcrumb: function(on_reverse_breadcrumb) { + add_breadcrumb: function(options) { + var options = options || {}; + // 7.0 backward compatibility + if (typeof options == 'function') { + options = { + on_reverse_breadcrumb: options + }; + } + // end of 7.0 backward compatibility var self = this; var views = [this.active_view || this.views_src[0].view_type]; this.on('switch_mode', self, function(mode) { @@ -661,7 +680,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ views.push(mode); } }); - this.getParent().push_breadcrumb({ + var item = _.extend({ widget: this, action: this.action, show: function(index) { @@ -695,9 +714,9 @@ instance.web.ViewManager = instance.web.Widget.extend({ titles.pop(); } return titles; - }, - on_reverse_breadcrumb: on_reverse_breadcrumb, - }); + } + }, options); + this.getParent().push_breadcrumb(item); }, /** * Returns to the view preceding the caller view in this manager's From ae28294289cd2807008266e27392c3388c74ef5d Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 14 Mar 2013 12:04:31 +0100 Subject: [PATCH 60/89] [FIX] auth_signup: force password and login inputs to have a data-modes setted bzr revid: chs@openerp.com-20130314110431-a09jk7zwdh5dsdpq --- addons/auth_signup/static/src/xml/auth_signup.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml index 9ef4f394e27..1c41dbed181 100644 --- a/addons/auth_signup/static/src/xml/auth_signup.xml +++ b/addons/auth_signup/static/src/xml/auth_signup.xml @@ -12,6 +12,9 @@
  • Username
  • Username (Email)
  • + + this.attr('data-modes', 'default signup reset'); +
  • Confirm Password
  • From d5ec6fdcb5daff56791131c587ac03613e0c2a7b Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 14 Mar 2013 12:09:27 +0100 Subject: [PATCH 61/89] [FIX] auth_openid: add data-modes attribute on
  • tags to be compatible with auth_signup module. show()/hide() elements explicitly instead of setting a specific class for this job. bzr revid: chs@openerp.com-20130314110927-rvb21ii1lbfpmmna --- addons/auth_openid/static/src/css/openid.css | 9 ------ .../auth_openid/static/src/js/auth_openid.js | 21 +++++++++---- .../static/src/xml/auth_openid.xml | 31 ++++++++++++------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/addons/auth_openid/static/src/css/openid.css b/addons/auth_openid/static/src/css/openid.css index ab01ffd2f60..dc3ffcf4a20 100644 --- a/addons/auth_openid/static/src/css/openid.css +++ b/addons/auth_openid/static/src/css/openid.css @@ -8,11 +8,6 @@ padding-left: 20px; } -.auth_choice { - position: static; - display: none; -} - .openid_providers { padding: 0; list-style: none; @@ -50,7 +45,3 @@ .openid_providers a[title="Yahoo!"] { background-image: url(../img/yahoo.png); } .openid_providers a[title="Launchpad"] { background-image: url(../img/launchpad.png); } - -li.auth_choice.selected { - display: table-row; -} diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js index f8615481a40..c8e2c710350 100644 --- a/addons/auth_openid/static/src/js/auth_openid.js +++ b/addons/auth_openid/static/src/js/auth_openid.js @@ -14,6 +14,16 @@ instance.web.Login = instance.web.Login.extend({ self.$openid_selected_input = $(); self.$openid_selected_provider = null; + + // Hook auth_signup events. noop if module is not installed. + self.on('change:login_mode', self, function() { + var mode = self.get('login_mode') || 'default'; + if (mode !== 'default') { + return; + } + self.do_openid_select(self.$openid_selected_button, self.$openid_selected_provider, true); + }); + var openIdProvider = null; if (self.has_local_storage && self.remember_credentials) { @@ -21,12 +31,10 @@ instance.web.Login = instance.web.Login.extend({ } if (openIdProvider) { - $openid_selected_provider = openIdProvider; + self.$openid_selected_provider = openIdProvider; self.do_openid_select('a[href="#' + openIdProvider + '"]', openIdProvider, true); - if (self.has_local_storage && self.remember_credentials) { - self.$openid_selected_input.find('input').val(localStorage.getItem('openid-login')); - } + self.$openid_selected_input.find('input').val(localStorage.getItem('openid-login') || ''); } else { self.do_openid_select('a[data-url=""]', 'login,password', true); @@ -49,11 +57,12 @@ instance.web.Login = instance.web.Login.extend({ do_openid_select: function (button, provider, noautosubmit) { var self = this; + self.$('li[data-provider]').hide(); self.$openid_selected_button.add(self.$openid_selected_input).removeClass('selected'); self.$openid_selected_button = self.$el.find(button).addClass('selected'); var input = _(provider.split(',')).map(function(p) { return 'li[data-provider="'+p+'"]'; }).join(','); - self.$openid_selected_input = self.$el.find(input).addClass('selected'); + self.$openid_selected_input = self.$el.find(input).show().addClass('selected'); self.$openid_selected_input.find('input:first').focus(); self.$openid_selected_provider = (self.$openid_selected_button.attr('href') || '').substr(1); @@ -62,7 +71,7 @@ instance.web.Login = instance.web.Login.extend({ localStorage.setItem('openid-provider', self.$openid_selected_provider); } - if (!noautosubmit && self.$openid_selected_input.length == 0) { + if (!noautosubmit && self.$openid_selected_input.length === 0) { self.$el.find('form').submit(); } diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml index 6a40439a012..9802b8adda5 100644 --- a/addons/auth_openid/static/src/xml/auth_openid.xml +++ b/addons/auth_openid/static/src/xml/auth_openid.xml @@ -4,7 +4,7 @@ -
      +
      • Password
      • Google
      • Google
      • @@ -14,34 +14,43 @@ - -
      • + +
      • Google Apps Domain
      • -
      • +
      • -
      • +
      • Username
      • -
      • +
      • -
      • +
      • OpenID URL
      • -
      • +
      • - + + this.each(function() { + var $i = $(this); + $i.add($i.prev()).attr('data-provider', 'password'); + }); + + this.each(function() { var $i = $(this), - dp = $i.find('input').attr('name'); - $i.add($i.prev()).attr('class', 'auth_choice').attr('data-provider', dp); + dp = $i.find('input').attr('name'), + $p = $i.prev(); + // $p may not be the correct label when auth_signup is installed. + while(($p.attr('data-modes') || 'default') !== 'default') { $p = $p.prev(); } + $i.add($p).attr('data-provider', dp); }); From e37287988264ece0ff1e475f28d304fba7b0a3b1 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 14 Mar 2013 12:14:21 +0100 Subject: [PATCH 62/89] [FIX] auth_openid: use data-provider instead of title to match provider logo as title is translatable bzr revid: chs@openerp.com-20130314111421-sf5jrig5vw3i1dlg --- addons/auth_openid/static/src/css/openid.css | 18 +++++++++--------- .../auth_openid/static/src/xml/auth_openid.xml | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/auth_openid/static/src/css/openid.css b/addons/auth_openid/static/src/css/openid.css index dc3ffcf4a20..33c3d99cef4 100644 --- a/addons/auth_openid/static/src/css/openid.css +++ b/addons/auth_openid/static/src/css/openid.css @@ -35,13 +35,13 @@ border-color: #9A0404; } -.openid_providers a[title="Password"] { background-image: url(../img/textfield_key.png); } -.openid_providers a[title="AOL"] { background-image: url(../img/aol.png); } -.openid_providers a[title="ClaimID"] { background-image: url(../img/claimid.png); } -.openid_providers a[title="Google"] { background-image: url(../img/googlefav.png); } -.openid_providers a[title="Google Apps"] { background-image: url(../img/marketplace.gif); } -.openid_providers a[title="MyOpenID"] { background-image: url(../img/myopenid.png); } -.openid_providers a[title="VeriSign"] { background-image: url(../img/verisign.png); } -.openid_providers a[title="Yahoo!"] { background-image: url(../img/yahoo.png); } -.openid_providers a[title="Launchpad"] { background-image: url(../img/launchpad.png); } +.openid_providers a[data-provider="Password"] { background-image: url(../img/textfield_key.png); } +.openid_providers a[data-provider="AOL"] { background-image: url(../img/aol.png); } +.openid_providers a[data-provider="ClaimID"] { background-image: url(../img/claimid.png); } +.openid_providers a[data-provider="Google"] { background-image: url(../img/googlefav.png); } +.openid_providers a[data-provider="Google Apps"] { background-image: url(../img/marketplace.gif); } +.openid_providers a[data-provider="MyOpenID"] { background-image: url(../img/myopenid.png); } +.openid_providers a[data-provider="VeriSign"] { background-image: url(../img/verisign.png); } +.openid_providers a[data-provider="Yahoo!"] { background-image: url(../img/yahoo.png); } +.openid_providers a[data-provider="Launchpad"] { background-image: url(../img/launchpad.png); } diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml index 9802b8adda5..4a170c90e1e 100644 --- a/addons/auth_openid/static/src/xml/auth_openid.xml +++ b/addons/auth_openid/static/src/xml/auth_openid.xml @@ -5,11 +5,11 @@ From 410bb553c21a3a3a372826031412a462fc01f225 Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 14 Mar 2013 12:41:30 +0100 Subject: [PATCH 63/89] [IMP]auth_signup: state wording bzr revid: dle@openerp.com-20130314114130-ljeha8ys7vhdmf4y --- addons/auth_signup/res_users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 9718897ef82..5553be78f63 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -168,7 +168,7 @@ class res_users(osv.Model): _columns = { 'state': fields.function(_get_state, string='Status', type='selection', - selection=[('new', 'New'), ('active', 'Active'), ('reset', 'Resetting Password')]), + selection=[('new', 'Never Connected'), ('active', 'Activated'), ('reset', 'Invitation Pending')]), } def signup(self, cr, uid, values, token=None, context=None): From 1e21bea9a73f0a2dfd66964cec9670e9f0bab201 Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Thu, 14 Mar 2013 12:47:28 +0100 Subject: [PATCH 64/89] [FIX] LinkedIn integration https courtesy of Holger Brunn lp bug: https://launchpad.net/bugs/1135873 fixed bzr revid: jco@openerp.com-20130314114728-zzb2x5f3zf3gm3aa --- addons/web_linkedin/static/src/js/linkedin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js index d6237e48d51..a7409570958 100644 --- a/addons/web_linkedin/static/src/js/linkedin.js +++ b/addons/web_linkedin/static/src/js/linkedin.js @@ -19,7 +19,7 @@ openerp.web_linkedin = function(instance) { return self.linkedin_def.promise(); var tag = document.createElement('script'); tag.type = 'text/javascript'; - tag.src = "http://platform.linkedin.com/in.js"; + tag.src = "https://platform.linkedin.com/in.js"; tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_contactinfo'; document.getElementsByTagName('head')[0].appendChild(tag); self.linkedin_added = true; From 3c8dbf0ad5ba2dff74d9848febdca69604243adc Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 14 Mar 2013 12:50:28 +0100 Subject: [PATCH 65/89] [FIX] Fixed infobox attrs bzr revid: fme@openerp.com-20130314115028-f2x6is15jmicaumc --- addons/auth_signup/res_users.py | 3 +-- addons/auth_signup/res_users_view.xml | 12 +++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index e577482f33e..3c29788e1eb 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -161,7 +161,7 @@ class res_users(osv.Model): def _get_state(self, cr, uid, ids, name, arg, context=None): res = {} for user in self.browse(cr, uid, ids, context): - res[user.id] = ('reset' if user.signup_valid else + res[user.id] = ('reset' if user.signup_valid and user.login_date else 'active' if user.login_date else 'new') return res @@ -169,7 +169,6 @@ class res_users(osv.Model): _columns = { 'state': fields.function(_get_state, string='Status', type='selection', selection=[('new', 'New'), ('active', 'Active'), ('reset', 'Resetting Password')]), - 'signup_url': fields.related('partner_id', 'signup_url', type='char', string='Reset password', readonly=True), } def signup(self, cr, uid, values, token=None, context=None): diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml index cb1ba207c9a..4ff7ee7afc0 100644 --- a/addons/auth_signup/res_users_view.xml +++ b/addons/auth_signup/res_users_view.xml @@ -17,9 +17,15 @@
        -
        -

        This user received a link in order to reset his password.

        -

        (this will log you out)

        +
        +

        + This user received the following link in order to reset his password. +

        +

        + This user has been invited with the following link. +

        +

        (this link will log you out)

        +
        From ae24f3fb717b357d51c1ecea8c5c6da8f6b9067f Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 14 Mar 2013 12:50:55 +0100 Subject: [PATCH 66/89] [FIX] Do not restraint info box width bzr revid: fme@openerp.com-20130314115055-7vv9nw51hf284lz3 --- addons/web/static/src/css/base.css | 1 - addons/web/static/src/css/base.sass | 1 - 2 files changed, 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 28afd0679b7..fb8391433db 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2243,7 +2243,6 @@ padding: 4px; } .openerp .oe_form .oe_form_box_info > p { - width: 50%; margin: auto; } .openerp .oe_form .oe_form_button { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8d0cfee6b56..f649fee1137 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1772,7 +1772,6 @@ $sheet-padding: 16px border-bottom: 1px solid #cb6 padding: 4px > p - width: 50% margin: auto // }}} // FormView.group {{{ From 3417f2a250e6292184e5dcf039be866c72e343f3 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 14 Mar 2013 13:04:49 +0100 Subject: [PATCH 67/89] [FIX] auth_openid: better design bzr revid: chs@openerp.com-20130314120449-p2oef4oymc9nuwof --- addons/auth_openid/static/src/css/openid.css | 22 +++++++------------ .../auth_openid/static/src/js/auth_openid.js | 2 +- .../static/src/xml/auth_openid.xml | 4 ++-- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/addons/auth_openid/static/src/css/openid.css b/addons/auth_openid/static/src/css/openid.css index 33c3d99cef4..57c745f0aca 100644 --- a/addons/auth_openid/static/src/css/openid.css +++ b/addons/auth_openid/static/src/css/openid.css @@ -1,20 +1,15 @@ -.login .pane { - width: 260px; - height: 175px; -} - -.login .pane input[name='openid_url'] { +.oe_login .oe_login_pane input[name='openid_url'] { background: #fff url(../img/login-bg.gif) no-repeat 1px; padding-left: 20px; } -.openid_providers { - padding: 0; - list-style: none; - float: right; +.openerp .oe_login .openid_providers { + text-align: center; } - -.openid_providers li { +.openerp .oe_login .openid_providers ul { + display: inline-block; +} +.openerp .oe_login .openid_providers ul li { display: block; float: left; margin: 0 1px 3px 2px; @@ -24,7 +19,6 @@ display: block; width: 24px; height: 24px; - border: 1px solid #ddd; background: #fff url(../img/openid_16.png) no-repeat 50%; text-indent: -9999px; overflow: hidden; @@ -32,7 +26,7 @@ } .openid_providers a.selected { - border-color: #9A0404; + background-color: #DC5F59; } .openid_providers a[data-provider="Password"] { background-image: url(../img/textfield_key.png); } diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js index c8e2c710350..ac2804cb130 100644 --- a/addons/auth_openid/static/src/js/auth_openid.js +++ b/addons/auth_openid/static/src/js/auth_openid.js @@ -62,7 +62,7 @@ instance.web.Login = instance.web.Login.extend({ self.$openid_selected_button = self.$el.find(button).addClass('selected'); var input = _(provider.split(',')).map(function(p) { return 'li[data-provider="'+p+'"]'; }).join(','); - self.$openid_selected_input = self.$el.find(input).show().addClass('selected'); + self.$openid_selected_input = self.$el.find(input).show(); self.$openid_selected_input.find('input:first').focus(); self.$openid_selected_provider = (self.$openid_selected_button.attr('href') || '').substr(1); diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml index 4a170c90e1e..75fd2a8fe45 100644 --- a/addons/auth_openid/static/src/xml/auth_openid.xml +++ b/addons/auth_openid/static/src/xml/auth_openid.xml @@ -4,13 +4,13 @@ -
        From eccd12b5c3fb9e28483bf22040ecffadc55697ea Mon Sep 17 00:00:00 2001 From: "dle@openerp.com" <> Date: Thu, 14 Mar 2013 13:30:13 +0100 Subject: [PATCH 68/89] [FIX]portal_anonymous: set flag share to anonymous user bzr revid: dle@openerp.com-20130314123013-14jdmnh5eczyn0zh --- addons/portal_anonymous/portal_anonymous_data.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/portal_anonymous/portal_anonymous_data.xml b/addons/portal_anonymous/portal_anonymous_data.xml index ae97f4a577a..eb1fd3889b4 100644 --- a/addons/portal_anonymous/portal_anonymous_data.xml +++ b/addons/portal_anonymous/portal_anonymous_data.xml @@ -9,6 +9,7 @@ iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAAAAAAZai4+AAAMQElEQVR4nO2ce4wV1R3Hv7/fmbvrPliQZWEXWFgWEFgQBRNI0dZW7euPxliTRhNbW5NatammoaaPNKmpKRYiUunDFzEU28YYkRaiaX0hYhUELApaKG90l2VZdmVl2WXvnPPrH/c1M3d2uWdmePzB75+9d+7Mmc/8zjm/+T3OWRJciMLnGyBcLmLZyEUsG7mIZSNOAm2IQAAQQAAEAhBRrCYprjkVI6GPpkXFIIuHJYYJ6D/Wsb+97fiJk339A0ZVDa8bP3lG4xhAjDofWGIUcOifW3ceOFr026Q5V980CSbq2I2B5To49dILL/YAQE4tkhlf0ABG3Pzta+FG7EqJKEZL1/IZANgJuzMrBpxvvCuio7QeFcsVWTsLUEMogxSh7IEBcc8dVlrabyeoM40cRfjS3ihc0bC0bJoOp5R5lkLT1ghckbC0WV1bqiF20PCB/fiKpq30VUiVRgUozOgUY3mDaHaFKkmXeq5O/XehsTVDEc2dzX3Szqp1XPJTZCRRD4KYw+yFyBJtaVSTxGIxRkKmp6ZNG9nYNZUQEgAyo66ZnQrTizLPw250JYfF+OmHG7ZsukWKuQzeH1B2XJEMhHt10fM4+HHGDPwQRf1IqD1oZ7uS0hbpkfcYDWj51VgT1Jeo4+12vZhYJ8qoOlaAkrqWsGdtt2stMW3lfC6RyWG/n7ZrLvnIh04mcJ+ksYzqWE8hNmqYXTMRAzJWAXvOxABgDN/XporeNEL1sLLzEbF6deDWGr0AtOKFzxa//8g01Nq1HxFrfmUq0FO6UYmb6r37GcctOptkyuhzoS1+NGibBMSU2nTfu1xMBZYpZdoqZoyGRcVevGF1YvGy/lQ65HQj11m+EyMHZH4xrpi/zRpkYhPVHbH0T5PBckVeuQYYJDpTuM82ykgEKy2d38Wg4RnzsI+MZZCRBJaWVy4DDzqkU1hsHZIlgOXKCmeIQMjBl11jG/nEx3JllaJB32GUwhWt1lTxsbS8VD44FQM3tEbIjsTFMuZkS7E7moNycMnP+qPkbOJiubJ8MJNMCvjKZrGOqBPAMiZ9HYUqixygeZVIOgpVeDq2dBFufR9hIaDSbt1d99RDR7tBXCx0HA+LTJUu+8G9U+CWlGxKHivcSSfS1y5aAM2RWz8rVQymn7+6QJsYifkkqhhBYf3gL030nDxwVrSlzNd/4cZs+CxgGbqbB7f7pUn8TuQAAUnVVbGfNjaWMUX2IV0et9H4WJWTHT8X6ZpYoz3TSNzCnT5VbAaq4hUTkQDW2ZH4Qz77XCIioEwKILayktJWvqKpQ3PN1pIMllY4/f7h42r8lfUwiZjCeP5WRlxp/3VLJQA0LjwWrYAYkCSwXHm1GQA7DgPTdyfBlUhAtiYFJzvYHUw7oiM5pAljabO7xjOhU7gtUr3VL/HHp9BDPZ6clque26zsKikhEhtL+MA6b7JUaGBN3DYTwDK0q0vEd2BT/D5IwMik/VUekb2nbJNsRZIAVlFWpNeyNhAiCah7Qk1ANzWXxG00PhaZGXN9LjLTnIqQ4p2dJGAg+E4fBcnXwsoYdhL/VS3QX329YLhS6VnvVMV3bWIbZDFycAJSTABIpVD/XgIvxWRe1R/NBaAUA5gfYY1IsSTk2PQsagaAinlP9SXi2CTjBhpG95ZuU9Ewj5JxAxNzmjOOjZELyWkGIEZAcWP8vFygAdkFukr3IpaNXMSykeg5CI/bEMgk5X/QkVeCRzMQIia8duE/iwDRFMXAWmPliU6o6uwhs9eT6qZ09dgsVNdT82aOBgAtbKk1m04UgYCZobt27HhLLctm14w8s2RYbkkGG17dIAyAzMhh1zW3tMyb05gCRJO3e0u4V0lidDoTK3e/ufLez9cqVG7PuwpGfwsOcsH+s/mg2pUHAaBq7veffKNLRETSbol5gBKwjE6ntYhI/4F/PXzjpDIAoIo3CyG9lr4FcEBE5GCRJ9R35TsoZwBINd+8fENbBi1dQo5iaCxjXNcVETndvfH3d3wus1BGOaqMVspA4TQthyeDATDu9FbqjHtyPhSxykyP8Tfc/+yeUyIi2nWH9soGxzI6nbnDwO7V919bT1kiJoLCbyTtPdeVrWNAYHzTrwotB5vAAIiVwwBQOev2Fe/1ioiYoXo0FMtoN3PJwKH1S2+9fExmMDu5ma5wh0n7r0jLYjhEFfsCvqkr/x6WNxCUXV0/fPpNi9d/rEVE9CBsRTNRRDKrP/p2bv5o5+4OAHBgRPJlAaVv/ENw1SuZk4DA9AXsjXIXPHkrZa2QaIDA9NmJXWtQP+PK2dc0OQxooMi0ebEERkgRYPbv2rHzncMaABPE+BYZsZ73VEVwQRLTAQiQPjozwOW4t+x5wJOSkCyFtLevR/nsBbNmT68BoIXYG8XlsTSYoKAPtW3btr31GAAwS3HlBISb69ygkknvgoDNkaKkCJvvLT4VMNoGADHM6S1bUFl/+fx5k8aVAzCeCqSnQ/v3vHD/9fWZxkL3fWR+QsuJ4JIZIx0jQFBYKoFBJ2n50aA2mzhbNK79wsJ/7Pdemcd6+6HbWioZAKngur+AKPwlmIbU8hYDcPCTIJY2H1YPadyJM/Glqp57558O5NaXZLCMkesBwEmVUMhlXNUXmD6urAABDm4JArty16CrNzxsynEA4Jnc5Rl/iwyanXKGm9ZnfnUbtW1dYHOBoBUMCHrAvgYM/++vJSRKRLsuOFU5MzfsOdfuBNctPc/yWGAmEvaDAMGJgYC26dHPuEQnRdIVjQEswujSE4uaNmz0reIUdg9CAEHHp75mDO9YWXJWiTBlZO5zHmt86OKPcFHmCb+jRt1tGZyj/pXDgiWnSlUWCNNY/NoCGpzSk1Ka1273rhURnGiDAMI9x73aMvzBmtJ3OxCmIu+25Q6Nqyn1ckCod6nvOw71cmZD52H/eb/rLdn9JYOW/Jc8Vk1d6VgwtHa3Tw37cqr+xKMtrXY8V7y+efBGKxrznZf7a6jWIrMo3LPSd/a+3IdDvvMW9ZbcJAijJuYR8lhlE2wSnoZWdhbGMmFPFheefZ1GbX3eKrnbWCdBLNBEGyxR7U/nx6ewuy/Td4SufCsCLHNLnoYAoblgpAtRdVPpUAA0Huss7JHp+iyDJWjPJwPtpiEAzCh8zDVCaLQq1Ig6uDrXQ4JPjufU8ml3buqR/LbPQlkQzCn0VwGrPlgjOUMr9ETOjTI42MPZpk92ZZ/O8NvP22xoI6meWowFNIwo2p8zlBj+z4v5PtqdP9zTmf/4SNoqZJfLxoRpa/gltrWHx3N1Q9mVGwA0kH0pat60tvQ9jAAY44aJ51u2PakaaYel6fUXM6OLB/ZksYTRkZuTj7hWSSrCJOjiTjSYYNMKAMbjGXWw25bXFg6DAGje+He7rZLiefX40m7jLLE0vbyNDWDQ6jGinRmdm0VpuyGhaaoHxoM10RILnP4jAAj29ecXAOEoGNDqjdfsbBbBOxG9WPW2WIbX7WUD4KDHtB/JeBKPpG3r1RO99/dgNdpWJ4W7l8NAsN/TzLEBiOENL1uuhWBMTZkQbRHGVNvWcjX9+bAjjD0ebbX3ADLwYNi+mqGEMM2rXg9WlY1rk4GgnhXQ3F+IpQV9ndDq9ddsdywLZoRiATWWG6oAgFZ1KnS1FuIAlm6QWWLdjuZxXpaCtkzFKNvGYPjQGsLRo4W3DA+0Qb1su18ZhNomr1IKhELjI1S+aWk3DnntuXyC9MMh+8jOJOObJBwLY+3XoGjevUYO+B7nY7xgabMAMGb6pm4BizAqwtIYweO0y3fkY3dZlNLFXN837+u00SKCzYmhLRtafWk1943NVq5D9rLJ/hHkSQZtt4hg86Loi/63xuXFW8HPKISyHb6sawHLSJela5OcMCZ3+DbeeB+sujESVvCaKJUnNF7qO+Ad8qmmSFjBeRKh5kZodnz/GsGjLYNo2kpADFr8T+M1hLDcZZycCKb4NeLDsvVPkxKS8mmDYgHjYBWTJSgN4/0kni+EusrYy9QiCaGp3G+BfVijLVJvSQqhJeWfvz6s2gRWz0URwhWBI14sqR5zTmnyImWBEe8baOfLcJEe0zwEFjD2XNLkhTC8PgDi/2Yb7ycjhCnBf+PgxxoXe410NGkJ3teLRZhwnrCmBw/4tXVpVezVyBHE8LTgIb+2Kkach6lIMnps0KH1YZnhDecBizFhZHDs/B9R17D2kvkawAAAAABJRU5ErkJggg== + From 0c0528d8343cdac3944551bddf8c595a75a601d2 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 14 Mar 2013 13:40:46 +0100 Subject: [PATCH 69/89] [FIX] account_asset: import statement bzr revid: qdp-launchpad@openerp.com-20130314124046-mwqslwiy81jwd9kk --- addons/account_asset/account_asset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 29df81b5279..5a22a888772 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -25,7 +25,7 @@ from dateutil.relativedelta import relativedelta from openerp.osv import fields, osv import openerp.addons.decimal_precision as dp -from tools.translate import _ +from openerp.tools.translate import _ class account_asset_category(osv.osv): _name = 'account.asset.category' From 3d53abcc8ea1836302e9fdd676b76278147065b1 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 14 Mar 2013 14:51:41 +0100 Subject: [PATCH 70/89] [FIX] corrected small problem that made appear "false" in empty field text bzr revid: nicolas.vanhoren@openerp.com-20130314135141-lnifcsa405qzjp0j --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 2db65705c94..1e23517043a 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2602,7 +2602,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we this.$textarea.trigger("autosize"); } } else { - var txt = this.get("value"); + var txt = this.get("value") || ''; this.$(".oe_form_text_content").text(txt); } }, From ddd252b5d17417aff5726067b6aa9ccfa90e7c6e Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 14 Mar 2013 15:45:03 +0100 Subject: [PATCH 71/89] [FIX] EmbeddedClient.do_action() forward all arguments bzr revid: chs@openerp.com-20130314144503-e5ewicf13er2clh8 --- addons/web/static/src/js/chrome.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 09ac02e326f..b7e46cb37ed 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1462,8 +1462,9 @@ instance.web.EmbeddedClient = instance.web.Client.extend({ }); }, - do_action: function(action) { - return this.action_manager.do_action(action); + do_action: function(/*...*/) { + var am = this.action_manager; + return am.do_action.apply(am, arguments); }, authenticate: function() { From 7c4279cbc960a57cba1b9deba671a525067dd749 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 14 Mar 2013 15:50:17 +0100 Subject: [PATCH 72/89] [FIX] apps: hide breadcrum of the remote action bzr revid: chs@openerp.com-20130314145017-k2502iwwovj379m0 --- openerp/addons/base/static/src/js/apps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/static/src/js/apps.js b/openerp/addons/base/static/src/js/apps.js index a55c89a0483..8e11f07d0d3 100644 --- a/openerp/addons/base/static/src/js/apps.js +++ b/openerp/addons/base/static/src/js/apps.js @@ -96,7 +96,7 @@ openerp.base = function(instance) { client.replace(self.$el). done(function() { client.$el.removeClass('openerp'); - client.do_action(self.remote_action_id); + client.do_action(self.remote_action_id, {hide_breadcrumb: true}); }); }). fail(function(client) { From eed1a93749e1815e2ecd4409017df30e4a70db7a Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 14 Mar 2013 15:53:37 +0100 Subject: [PATCH 73/89] [FIX] account: removal of warnings at database creation due to unknown fields in account.payment.term.line model bzr revid: qdp-launchpad@openerp.com-20130314145337-vriuhu2sozdeyu5a --- addons/account/data/account_data.xml | 2 -- addons/account/demo/account_demo.xml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml index 949d03324f3..9d2e65a3a4c 100644 --- a/addons/account/data/account_data.xml +++ b/addons/account/data/account_data.xml @@ -30,7 +30,6 @@ - 15 Days balance @@ -48,7 +47,6 @@ - 30 Net Days balance diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml index 6918ad44702..8a450c0b6aa 100644 --- a/addons/account/demo/account_demo.xml +++ b/addons/account/demo/account_demo.xml @@ -135,7 +135,6 @@ 30 Days End of Month - 30 Days End of Month balance @@ -147,16 +146,13 @@ 30% Advance End 30 Days - 30% Advance procent - - Remaining Balance balance From a4926b070b1d634913d1e2353f2418aaab8966d5 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 14 Mar 2013 16:03:32 +0100 Subject: [PATCH 74/89] [FIX] hr_expense: removal of references to account_voucher module bzr revid: qdp-launchpad@openerp.com-20130314150332-uifxmj2h2z4k2w28 --- addons/hr_expense/hr_expense.py | 5 ++--- addons/hr_expense/report/hr_expense_report.py | 3 --- addons/hr_expense/report/hr_expense_report_view.xml | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 9e3064eb6d1..15926336697 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -40,7 +40,7 @@ class hr_expense_expense(osv.osv): if context is None: context = {} if not default: default = {} - default.update({'voucher_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False}) + default.update({'date_confirm': False, 'date_valid': False, 'user_valid': False}) return super(hr_expense_expense, self).copy(cr, uid, id, default, context=context) def _amount(self, cr, uid, ids, field_name, arg, context=None): @@ -85,7 +85,6 @@ class hr_expense_expense(osv.osv): 'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ), 'note': fields.text('Note'), 'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account')), - 'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"), 'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=True), @@ -148,7 +147,7 @@ class hr_expense_expense(osv.osv): ''' This method prepare the creation of the account move related to the given expense. - :param expense_id: Id of voucher for which we are creating account_move. + :param expense_id: Id of expense for which we are creating account_move. :return: mapping between fieldname and value of account move to create :rtype: dict ''' diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py index 6f18c668413..2adc11535ff 100644 --- a/addons/hr_expense/report/hr_expense_report.py +++ b/addons/hr_expense/report/hr_expense_report.py @@ -43,7 +43,6 @@ class hr_expense_report(osv.osv): 'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True), 'date_confirm': fields.date('Confirmation Date', readonly=True), 'date_valid': fields.date('Validation Date', readonly=True), - 'voucher_id': fields.many2one('account.voucher', 'Receipt', readonly=True), 'department_id':fields.many2one('hr.department','Department', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), 'user_id':fields.many2one('res.users', 'Validation User', readonly=True), @@ -77,7 +76,6 @@ class hr_expense_report(osv.osv): s.currency_id, to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm, to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid, - s.voucher_id, s.user_valid as user_id, s.department_id, to_char(date_trunc('day',s.create_date), 'YYYY') as year, @@ -107,7 +105,6 @@ class hr_expense_report(osv.osv): to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY'), l.product_id, l.analytic_account, - s.voucher_id, s.currency_id, s.user_valid, s.department_id, diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 9f94c264c5e..be1588f3c3b 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -12,7 +12,6 @@ - From 7d0630b44828e8ceb4998cbe9bc0b15a440b22d4 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 14 Mar 2013 16:06:14 +0100 Subject: [PATCH 75/89] [FIX]hr_timesheet_sheet: fix user_id variable referenced before assignment when no employee_id specified in onchange_employee_id bzr revid: csn@openerp.com-20130314150614-bsnwc4gk7a9eyri0 --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index c473670b014..2cf79596148 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -217,6 +217,7 @@ class hr_timesheet_sheet(osv.osv): def onchange_employee_id(self, cr, uid, ids, employee_id, context=None): department_id = False + user_id = False if employee_id: empl_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context) department_id = empl_id.department_id.id From 4b556f625e149379fa6f3e731e23fadac30a1036 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 14 Mar 2013 16:40:03 +0100 Subject: [PATCH 76/89] [IMP] res_users info box change wording bzr revid: fme@openerp.com-20130314154003-r15yz1gvy324vz36 --- addons/auth_signup/res_users_view.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml index 4ff7ee7afc0..ea2efc7a875 100644 --- a/addons/auth_signup/res_users_view.xml +++ b/addons/auth_signup/res_users_view.xml @@ -19,12 +19,12 @@

        - This user received the following link in order to reset his password. + A password reset has been requested for this user. An email containing the following link has been sent:

        - This user has been invited with the following link. + This user has not logged in yet. An invitation email has been sent with the following subscription link:

        -

        (this link will log you out)

        +

        @@ -33,6 +33,7 @@
        From c79c23d26e256373c6866c1b0973a2876c0d8c46 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Thu, 14 Mar 2013 16:44:18 +0100 Subject: [PATCH 77/89] [REF] orm: - isinstance(ids, dict) is done at the end, but not at the beginning, so if ids was a single dict, it would break in the map(lambda). - The loop to convert None to False can be done in _read_flat instead of read (there is already plenty of loops in _read_flat) - The __getattr__ was breaking the stacktrace. bzr revid: vmt@openerp.com-20130314154418-0wmxfw1ot92kjmzf --- openerp/osv/orm.py | 70 ++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 96f56ee6826..1efc9bea489 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -480,7 +480,9 @@ class browse_record(object): try: return self[name] except KeyError, e: - raise AttributeError(e) + import sys + exc_info = sys.exc_info() + raise AttributeError, "Got %r while trying to get attribute `%s`." % (e, name), exc_info[2] def __contains__(self, name): return (name in self._table._columns) or (name in self._table._inherit_fields) or hasattr(self._table, name) @@ -3589,8 +3591,6 @@ class BaseModel(object): """ - if not context: - context = {} self.check_access_rights(cr, user, 'read') fields = self.check_field_access_rights(cr, user, 'read', fields) if isinstance(ids, (int, long)): @@ -3600,12 +3600,7 @@ class BaseModel(object): select = map(lambda x: isinstance(x, dict) and x['id'] or x, select) result = self._read_flat(cr, user, select, fields, context, load) - for r in result: - for key, v in r.items(): - if v is None: - r[key] = False - - if isinstance(ids, (int, long, dict)): + if isinstance(ids, (int, long)): return result and result[0] or False return result @@ -3739,34 +3734,37 @@ class BaseModel(object): if field in self._columns: fobj = self._columns[field] - if not fobj: - continue - groups = fobj.read - if groups: - edit = False - for group in groups: - module = group.split(".")[0] - grp = group.split(".")[1] - cr.execute("select count(*) from res_groups_users_rel where gid IN (select res_id from ir_model_data where name=%s and module=%s and model=%s) and uid=%s", \ - (grp, module, 'res.groups', user)) - readonly = cr.fetchall() - if readonly[0][0] >= 1: - edit = True - break - elif readonly[0][0] == 0: - edit = False - else: - edit = False + if fobj: + groups = fobj.read + if groups: + edit = False + for group in groups: + module = group.split(".")[0] + grp = group.split(".")[1] + cr.execute("select count(*) from res_groups_users_rel where gid IN (select res_id from ir_model_data where name=%s and module=%s and model=%s) and uid=%s", \ + (grp, module, 'res.groups', user)) + readonly = cr.fetchall() + if readonly[0][0] >= 1: + edit = True + break + elif readonly[0][0] == 0: + edit = False + else: + edit = False + + if not edit: + if type(vals[field]) == type([]): + vals[field] = [] + elif type(vals[field]) == type(0.0): + vals[field] = 0 + elif type(vals[field]) == type(''): + vals[field] = '=No Permission=' + else: + vals[field] = False + + if vals[field] is None: + vals[field] = False - if not edit: - if type(vals[field]) == type([]): - vals[field] = [] - elif type(vals[field]) == type(0.0): - vals[field] = 0 - elif type(vals[field]) == type(''): - vals[field] = '=No Permission=' - else: - vals[field] = False return res # TODO check READ access From 659c5f00590c8813e48e70573b2e2be1f67a582a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 14 Mar 2013 17:01:41 +0100 Subject: [PATCH 78/89] [REM] Removed one state bzr revid: fme@openerp.com-20130314160141-5hrurkcy4w3wc4ca --- addons/auth_signup/res_users.py | 6 ++---- addons/auth_signup/res_users_view.xml | 15 +++++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 74bda08cb0b..8d717ece113 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -161,14 +161,12 @@ class res_users(osv.Model): def _get_state(self, cr, uid, ids, name, arg, context=None): res = {} for user in self.browse(cr, uid, ids, context): - res[user.id] = ('reset' if user.signup_valid and user.login_date else - 'active' if user.login_date else - 'new') + res[user.id] = ('active' if user.login_date else 'new') return res _columns = { 'state': fields.function(_get_state, string='Status', type='selection', - selection=[('new', 'Never Connected'), ('active', 'Activated'), ('reset', 'Invitation Pending')]), + selection=[('new', 'Never Connected'), ('active', 'Activated')]), } def signup(self, cr, uid, values, token=None, context=None): diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml index ea2efc7a875..156d9f2839a 100644 --- a/addons/auth_signup/res_users_view.xml +++ b/addons/auth_signup/res_users_view.xml @@ -17,12 +17,12 @@
        -
        -

        +

        +

        A password reset has been requested for this user. An email containing the following link has been sent:

        -

        - This user has not logged in yet. An invitation email has been sent with the following subscription link: +

        + An invitation email has been sent to this user with the following subscription link:

        @@ -32,8 +32,11 @@
        From 3b1b386561510fa24da43ccd9503e8fcc94e9d0b Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Thu, 14 Mar 2013 17:13:27 +0100 Subject: [PATCH 79/89] [FIX] Remove sales filter in Time and Materials to Invoice bzr revid: jco@openerp.com-20130314161327-xtq04qqi9w7ohgb3 --- .../account_analytic_analysis_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index f00690ab372..a9437267611 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -249,7 +249,7 @@ form tree,form [('invoice_id','=',False)] - {'search_default_to_invoice': 1, 'search_default_sales': 1} + {'search_default_to_invoice': 1}

        From 6262548099187ed6e34ac3f5c7543463c03010e1 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 14 Mar 2013 17:26:08 +0100 Subject: [PATCH 80/89] [FIX] account_followup: typo bzr revid: qdp-launchpad@openerp.com-20130314162608-1yw7etvz1scxo5h6 --- addons/account_followup/account_followup_customers.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml index 7a3808ddefb..6be11399b68 100644 --- a/addons/account_followup/account_followup_customers.xml +++ b/addons/account_followup/account_followup_customers.xml @@ -51,7 +51,7 @@ - + From 868075d7ca9df953ff55bd16bbbe3b5ff144a751 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 14 Mar 2013 17:39:13 +0100 Subject: [PATCH 81/89] [FIX] Give correct context for invitatio bzr revid: fme@openerp.com-20130314163913-wteq8qrimxqmro76 --- addons/auth_signup/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml index 156d9f2839a..7b58c3eb714 100644 --- a/addons/auth_signup/res_users_view.xml +++ b/addons/auth_signup/res_users_view.xml @@ -35,7 +35,7 @@ type="object" name="action_reset_password" attrs="{'invisible': [('state', '!=', 'active')]}"/>

        From 513601e6417fa3f4e72dbaae5661a759e478ff59 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 14 Mar 2013 17:44:13 +0100 Subject: [PATCH 82/89] [FIX] sale: don't try to post messages on SO if there is no sale related to an invoice bzr revid: qdp-launchpad@openerp.com-20130314164413-qv3j3b3tcc4zt6b7 --- addons/sale/sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index e71199ab30e..09ee8d5e3fd 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1020,7 +1020,8 @@ class account_invoice(osv.Model): sale_order_obj = self.pool.get('sale.order') res = super(account_invoice, self).confirm_paid(cr, uid, ids, context=context) so_ids = sale_order_obj.search(cr, uid, [('invoice_ids', 'in', ids)], context=context) - sale_order_obj.message_post(cr, uid, so_ids, body=_("Invoice paid"), context=context) + if so_ids: + sale_order_obj.message_post(cr, uid, so_ids, body=_("Invoice paid"), context=context) return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From d4b1f78b573acd01133f472230509f2f1237789d Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 14 Mar 2013 18:02:26 +0100 Subject: [PATCH 83/89] [FIX] purchase; don't try to post messages on PO if there is no purchase related to an invoice bzr revid: qdp-launchpad@openerp.com-20130314170226-3bvvsvd8aq2a9lkg --- addons/purchase/purchase.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 40bfa9cc654..23f889b136f 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1208,14 +1208,16 @@ class account_invoice(osv.Model): res = super(account_invoice, self).invoice_validate(cr, uid, ids, context=context) purchase_order_obj = self.pool.get('purchase.order') po_ids = purchase_order_obj.search(cr, uid, [('invoice_ids', 'in', ids)], context=context) - purchase_order_obj.message_post(cr, uid, po_ids, body=_("Invoice received"), context=context) + if po_ids: + purchase_order_obj.message_post(cr, uid, po_ids, body=_("Invoice received"), context=context) return res def confirm_paid(self, cr, uid, ids, context=None): res = super(account_invoice, self).confirm_paid(cr, uid, ids, context=context) purchase_order_obj = self.pool.get('purchase.order') po_ids = purchase_order_obj.search(cr, uid, [('invoice_ids', 'in', ids)], context=context) - purchase_order_obj.message_post(cr, uid, po_ids, body=_("Invoice paid"), context=context) + if po_ids: + purchase_order_obj.message_post(cr, uid, po_ids, body=_("Invoice paid"), context=context) return res From ac64a4fcb872a8a8f76ff445d27b96c1db7f0ffb Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 14 Mar 2013 23:26:16 +0100 Subject: [PATCH 84/89] [IMP] Improved box_info box_warning css bzr revid: fme@openerp.com-20130314222616-gz7f0zpnpz0skq88 --- addons/web/static/src/css/base.css | 15 ++++++++++++--- addons/web/static/src/css/base.sass | 12 +++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fb8391433db..2056bc2876f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2111,9 +2111,6 @@ .openerp .oe_form_readonly .oe_form .oe_form_field_date { width: auto; } -.openerp .oe_form_editable .oe_page_only { - display: none !important; -} .openerp .oe_form_nosheet { margin: 16px; } @@ -2245,6 +2242,18 @@ .openerp .oe_form .oe_form_box_info > p { margin: auto; } +.openerp .oe_form .oe_form_box_warning { + background: #bd362f; + border-bottom: 1px solid #990000; + padding: 4px; +} +.openerp .oe_form .oe_form_box_warning * { + color: white; + text-shadow: none; +} +.openerp .oe_form .oe_form_box_warning > p { + margin: auto; +} .openerp .oe_form .oe_form_button { margin: 2px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f649fee1137..69e7ff55589 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1669,9 +1669,6 @@ $sheet-padding: 16px display: none !important .oe_form .oe_form_field_date width: auto - .oe_form_editable - .oe_page_only - display: none !important // Sheet and padding .oe_form_nosheet margin: 16px @@ -1773,6 +1770,15 @@ $sheet-padding: 16px padding: 4px > p margin: auto + .oe_form_box_warning + background: #bd362f + border-bottom: 1px solid #900 + padding: 4px + * + color: white + text-shadow: none + > p + margin: auto // }}} // FormView.group {{{ .oe_form From a551be093e58c7010010414b831529c3409e9792 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 15 Mar 2013 03:03:52 +0100 Subject: [PATCH 85/89] [FIX] crm_partner_assign next review date in list bzr revid: al@openerp.com-20130315020352-jx3y451n301ykbqx --- addons/crm_partner_assign/res_partner_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml index aeafc367792..d1a704bd9ad 100644 --- a/addons/crm_partner_assign/res_partner_view.xml +++ b/addons/crm_partner_assign/res_partner_view.xml @@ -77,6 +77,7 @@ + From 9eb729057f1e94a8e2463ca4f2ba1e959ff89895 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 15 Mar 2013 03:22:39 +0100 Subject: [PATCH 86/89] [FIX] crm_partner_assign form use v7 groups bzr revid: al@openerp.com-20130315022239-jfypwp9e027wdat5 --- .../crm_partner_assign/res_partner_view.xml | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml index d1a704bd9ad..433a290ae81 100644 --- a/addons/crm_partner_assign/res_partner_view.xml +++ b/addons/crm_partner_assign/res_partner_view.xml @@ -105,17 +105,19 @@ - - - - - - - - - - - + + + + + + + + + + + + + From e23fba677e71511d5f9d2d03b84ff7472ce0dcca Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 15 Mar 2013 04:56:39 +0000 Subject: [PATCH 87/89] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130315045639-qfbb8ay587g0rs6p --- openerp/addons/base/i18n/hu.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po index 3171747a8d6..51be0b3e189 100644 --- a/openerp/addons/base/i18n/hu.po +++ b/openerp/addons/base/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2013-03-12 17:34+0000\n" +"PO-Revision-Date: 2013-03-14 10:08+0000\n" "Last-Translator: krnkris \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-13 04:37+0000\n" +"X-Launchpad-Export-Date: 2013-03-15 04:56+0000\n" "X-Generator: Launchpad (build 16532)\n" #. module: base @@ -448,7 +448,7 @@ msgstr "" #: code:addons/orm.py:2649 #, python-format msgid "Invalid group_by" -msgstr "" +msgstr "Hibás csoportosítás" #. module: base #: field:ir.module.category,child_ids:0 @@ -1121,7 +1121,7 @@ msgstr "Megosztott tárterület (WebDAV)" #. module: base #: view:res.users:0 msgid "Email Preferences" -msgstr "" +msgstr "Email kiválasztás" #. module: base #: code:addons/base/ir/ir_fields.py:195 @@ -3000,14 +3000,14 @@ msgid "" " " msgstr "" "\n" -"Hibabejelentés kezelése.\n" +"Ügyfélszolgálat kezelése.\n" "====================\n" "\n" -"Mint a követelések felvitele és feldolgozása, Hibabejelentés és támogatás jó " -"eszközök a\n" +"Mint a reklamációk felvitele és feldolgozása, Ügyfélszolgálat és támogatás " +"jó eszközök a\n" "beavatkozás nyomon követésére. Ez a menü legjobban a szóbeli kommunikációhoz " "alkalmazkodik,\n" -"ami nem szükségszerűen kapcsolódik egy követeléshez. Válasszon ki egy " +"ami nem szükségszerűen kapcsolódik egy jótálláshoz. Válasszon ki egy " "ügyfelet, adjon hozzá megjegyzést\n" "és kategorizálja a beavatkozást egy csatornával és egy prioritási szinttel.\n" " " @@ -9642,7 +9642,7 @@ msgstr "" "-----------------------------------------------------------------------------" "-----------------------------\n" " * CRM Érdeklődések/Lehetőségek\n" -" * CRM garanciális és egyéb igények\n" +" * CRM reklamációs és egyéb igények\n" " * Projekt ügy\n" " * Projekt feladatok\n" " * Emberi erőforrás igények (Pályázók/jelentkezők)\n" @@ -12675,10 +12675,10 @@ msgid "" "Adds a Claim link to the delivery order.\n" msgstr "" "\n" -"Készítsen jótállási ügyet egy szállítási kézbesítési bizonylatból.\n" +"Készítsen reklamációs ügyet egy szállítási kézbesítési bizonylatból.\n" "=====================================\n" "\n" -"Egy jótálási linket ad a kézbesítési bizonylathoz.\n" +"Egy Reklamációs elérési utat ad a kézbesítési bizonylathoz.\n" #. module: base #: view:ir.model:0 @@ -16025,13 +16025,13 @@ msgid "" msgstr "" "\n" "\n" -"Vevői jótállások kezelése.\n" +"Vevői reklamációk kezelése.\n" "=======================\n" -"Ez az alkalmazás lehetővé teszi a vevők/beszállítók jótállásainak és " +"Ez az alkalmazás lehetővé teszi a vevők/beszállítók reklamációinak és " "garanciáinak nyomon követését.\n" "\n" -"Ez teljesen integrált az e-mail átjáróval, így automatikusan új jótállást " -"generálhat a beérkező emailek alapján.\n" +"Ez teljesen integrált az e-mail átjáróval, így automatikusan új reklamációt " +"generálhat a beérkező e-mailek alapján.\n" " " #. module: base From 2a05506a959849446e7c177447c5f8efe6eb79f2 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 15 Mar 2013 06:44:13 +0000 Subject: [PATCH 88/89] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130315064413-o75f8ljrruhoziqa --- addons/account_asset/i18n/hr.po | 2 +- addons/account_followup/i18n/nl.po | 8 +- addons/account_followup/i18n/tr.po | 8 +- addons/base_report_designer/i18n/hu.po | 22 +- addons/base_setup/i18n/hu.po | 151 +++-- addons/base_status/i18n/hu.po | 80 +++ addons/base_vat/i18n/fr.po | 10 +- addons/base_vat/i18n/hu.po | 10 +- addons/board/i18n/hu.po | 63 +- addons/claim_from_delivery/i18n/hu.po | 14 +- addons/crm/i18n/hr.po | 199 ++++--- addons/crm/i18n/hu.po | 169 ++++-- addons/document_page/i18n/hr.po | 56 +- addons/mrp/i18n/lv.po | 132 +++-- addons/mrp_byproduct/i18n/lv.po | 106 ++++ addons/mrp_operations/i18n/lv.po | 785 +++++++++++++++++++++++++ addons/portal/i18n/tr.po | 25 +- addons/portal_crm/i18n/hu.po | 8 +- 18 files changed, 1500 insertions(+), 348 deletions(-) create mode 100644 addons/base_status/i18n/hu.po create mode 100644 addons/mrp_byproduct/i18n/lv.po create mode 100644 addons/mrp_operations/i18n/lv.po diff --git a/addons/account_asset/i18n/hr.po b/addons/account_asset/i18n/hr.po index fa81b0ac93c..23e0458ff14 100644 --- a/addons/account_asset/i18n/hr.po +++ b/addons/account_asset/i18n/hr.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n" +"X-Launchpad-Export-Date: 2013-03-15 06:43+0000\n" "X-Generator: Launchpad (build 16532)\n" #. module: account_asset diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po index ab01edff807..364de1b0e79 100644 --- a/addons/account_followup/i18n/nl.po +++ b/addons/account_followup/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2013-03-09 08:39+0000\n" +"PO-Revision-Date: 2013-03-14 14:44+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-10 05:14+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:43+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: account_followup #: model:email.template,subject:account_followup.email_template_account_followup_default @@ -546,7 +546,7 @@ msgstr "Afletteren van facturen en betalingen" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_s msgid "Do Manual Follow-Ups" -msgstr "Maak handmatige betalingsherinneringen" +msgstr "Handmatige betalingsherinneringen" #. module: account_followup #: report:account_followup.followup.print:0 diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po index 97884a97832..9016cbbe342 100644 --- a/addons/account_followup/i18n/tr.po +++ b/addons/account_followup/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2013-03-10 14:59+0000\n" +"PO-Revision-Date: 2013-03-14 20:32+0000\n" "Last-Translator: Ayhan KIZILTAN \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-11 05:42+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:43+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: account_followup #: model:email.template,subject:account_followup.email_template_account_followup_default @@ -537,7 +537,7 @@ msgstr "Faturaları ve Ödemeleri Uzlaştır" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_s msgid "Do Manual Follow-Ups" -msgstr "Elle İzleme Yap" +msgstr "Elle Takip Yap" #. module: account_followup #: report:account_followup.followup.print:0 diff --git a/addons/base_report_designer/i18n/hu.po b/addons/base_report_designer/i18n/hu.po index bd75f774cfb..b9e4f159320 100644 --- a/addons/base_report_designer/i18n/hu.po +++ b/addons/base_report_designer/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-03-14 11:40+0000\n" +"Last-Translator: krnkris \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:36+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: base_report_designer #: model:ir.model,name:base_report_designer.model_base_report_sxw @@ -25,7 +25,7 @@ msgstr "base.report.sxw" #. module: base_report_designer #: view:base_report_designer.installer:0 msgid "OpenERP Report Designer Configuration" -msgstr "" +msgstr "OpenERP Jelentéstervező beállítása" #. module: base_report_designer #: view:base_report_designer.installer:0 @@ -33,6 +33,8 @@ msgid "" "This plug-in allows you to create/modify OpenERP Reports into OpenOffice " "Writer." msgstr "" +"Ez a plug-in lehetővé teszi az OpenERP jelentések létrehozását/módosítását " +"az OpenOffice Writer keresztül." #. module: base_report_designer #: view:base.report.sxw:0 @@ -78,7 +80,7 @@ msgstr "RML jelentés" #. module: base_report_designer #: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard msgid "Report Designer" -msgstr "" +msgstr "Jelentéstervező" #. module: base_report_designer #: field:base_report_designer.installer,name:0 @@ -95,7 +97,7 @@ msgstr "" #: view:base_report_designer.installer:0 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard msgid "OpenERP Report Designer" -msgstr "" +msgstr "OpenERP jelentéstervező" #. module: base_report_designer #: view:base.report.sxw:0 @@ -147,7 +149,7 @@ msgstr "" #. module: base_report_designer #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw msgid "Base Report sxw" -msgstr "" +msgstr "Alapértelmezett jelentés SXW" #. module: base_report_designer #: model:ir.model,name:base_report_designer.model_base_report_file_sxw @@ -157,12 +159,12 @@ msgstr "base.report.file.sxw" #. module: base_report_designer #: field:base_report_designer.installer,plugin_file:0 msgid "OpenObject Report Designer Plug-in" -msgstr "" +msgstr "OpenObject jelentéstervező Plug-in" #. module: base_report_designer #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer msgid "OpenERP Report Designer Installation" -msgstr "" +msgstr "OpenERP jelentéstervező telepítés" #. module: base_report_designer #: view:base.report.sxw:0 diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po index bea4203647d..94742feb001 100644 --- a/addons/base_setup/i18n/hu.po +++ b/addons/base_setup/i18n/hu.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-03-14 11:24+0000\n" +"Last-Translator: krnkris \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:37+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: base_setup #: view:sale.config.settings:0 msgid "Emails Integration" -msgstr "" +msgstr "e-amil integrálás" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -30,18 +30,20 @@ msgstr "Vendég" #. module: base_setup #: view:sale.config.settings:0 msgid "Contacts" -msgstr "" +msgstr "Kapcsolattartók" #. module: base_setup #: model:ir.model,name:base_setup.model_base_config_settings msgid "base.config.settings" -msgstr "" +msgstr "base.config.settings" #. module: base_setup #: field:base.config.settings,module_auth_oauth:0 msgid "" "Use external authentication providers, sign in with google, facebook, ..." msgstr "" +"Használjon külső azonosító tartalomkezelőt, lépjen be mint google, facebook, " +"... felhasználó" #. module: base_setup #: view:sale.config.settings:0 @@ -55,11 +57,21 @@ msgid "" "OpenERP using specific\n" " plugins for your preferred email application." msgstr "" +"OpenERP lehetővé teszi az automatikus érdeklődések (vagy egyéb dokumentumok) " +"létrehozását \n" +" a beérkező levelekből. Autokmatikusan tud e-" +"mailt szinkronizálni az OpenERP\n" +" alapértelmezett POP/IMAP fiókok használatával, " +"közvetlen az e-mail szerver címéhez tartozó \n" +" e-mail beillesztő skript használatával, vagy " +"kézzel saját betöltő plugin használatával az OpenERP\n" +" kiegészítőivel, az előnyben létesített levelező " +"használatához." #. module: base_setup #: field:sale.config.settings,module_sale:0 msgid "SALE" -msgstr "" +msgstr "ÉRTÉKESÍTÉS" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -69,74 +81,74 @@ msgstr "Tag" #. module: base_setup #: view:base.config.settings:0 msgid "Portal access" -msgstr "" +msgstr "Portál hozzáférés" #. module: base_setup #: view:base.config.settings:0 msgid "Authentication" -msgstr "" +msgstr "Azonosítás" #. module: base_setup #: view:sale.config.settings:0 msgid "Quotations and Sales Orders" -msgstr "" +msgstr "Árajánlatok és vevői megrendelések" #. module: base_setup #: view:base.config.settings:0 #: model:ir.actions.act_window,name:base_setup.action_general_configuration #: model:ir.ui.menu,name:base_setup.menu_general_configuration msgid "General Settings" -msgstr "" +msgstr "Általános beállítások" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Donor" -msgstr "" +msgstr "Donor" #. module: base_setup #: view:base.config.settings:0 msgid "Email" -msgstr "" +msgstr "E-mail" #. module: base_setup #: field:sale.config.settings,module_crm:0 msgid "CRM" -msgstr "" +msgstr "CRM ügyfélkapcsolat-kezelő rendszer" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Patient" -msgstr "" +msgstr "Páciens" #. module: base_setup #: field:base.config.settings,module_base_import:0 msgid "Allow users to import data from CSV files" -msgstr "" +msgstr "Lehetővé teszi a felhasználók adatainak betöltését CSV fájlokból" #. module: base_setup #: field:base.config.settings,module_multi_company:0 msgid "Manage multiple companies" -msgstr "" +msgstr "Többes válallkozás kezelése" #. module: base_setup #: view:sale.config.settings:0 msgid "On Mail Client" -msgstr "" +msgstr "Az e-mail ügyfelen" #. module: base_setup #: view:base.config.settings:0 msgid "--db-filter=YOUR_DATABAE" -msgstr "" +msgstr "--db-filter=YOUR_DATABAE" #. module: base_setup #: field:sale.config.settings,module_web_linkedin:0 msgid "Get contacts automatically from linkedIn" -msgstr "" +msgstr "Kapcsolatok automatikus behozatala a LinkeIn-ből" #. module: base_setup #: field:sale.config.settings,module_plugin_thunderbird:0 msgid "Enable Thunderbird plug-in" -msgstr "" +msgstr "Thunderbird plug-in bekapcsolása" #. module: base_setup #: view:base.setup.terminology:0 @@ -146,22 +158,22 @@ msgstr "res_config_contents" #. module: base_setup #: view:sale.config.settings:0 msgid "Customer Features" -msgstr "" +msgstr "Vavő tulajdonságai" #. module: base_setup #: view:base.config.settings:0 msgid "Import / Export" -msgstr "" +msgstr "Import / Export" #. module: base_setup #: view:sale.config.settings:0 msgid "Sale Features" -msgstr "" +msgstr "eladás tulajdonságai" #. module: base_setup #: field:sale.config.settings,module_plugin_outlook:0 msgid "Enable Outlook plug-in" -msgstr "" +msgstr "Outlook plug-in bekapcsolása" #. module: base_setup #: view:base.setup.terminology:0 @@ -169,21 +181,23 @@ msgid "" "You can use this wizard to change the terminologies for customers in the " "whole application." msgstr "" +"Használhatja ezt a varázslót a vevők nyelvezetének megváltoztatásához a " +"teljes alkalmazásra vonatkozólag." #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Tenant" -msgstr "" +msgstr "Haszonélvező" #. module: base_setup #: help:base.config.settings,module_share:0 msgid "Share or embbed any screen of openerp." -msgstr "" +msgstr "Bármely OpenERP képernyő megosztása vagy eltüntetése." #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Customer" -msgstr "" +msgstr "Vevő" #. module: base_setup #: help:sale.config.settings,module_web_linkedin:0 @@ -191,6 +205,8 @@ msgid "" "When you create a new contact (person or company), you will be able to load " "all the data from LinkedIn (photos, address, etc)." msgstr "" +"Ha új kapcsolatot hoz létre (személy vagy vállalkozás), akkor lehetősége " +"lesz a LinkedIn adatok betöltésére (fotók, címek, stb.)." #. module: base_setup #: help:base.config.settings,module_multi_company:0 @@ -199,6 +215,9 @@ msgid "" "companies.\n" " This installs the module multi_company." msgstr "" +"Többes vállalkozású környezetben dolgozni, a helyesen meghatározott " +"vállalatok közötti hozzáférési jogosultságokkal.\n" +" Ez a multi_company modult telepíti." #. module: base_setup #: view:base.config.settings:0 @@ -207,6 +226,9 @@ msgid "" "You can\n" " launch the OpenERP Server with the option" msgstr "" +"A közösségi portál csak akkor hozzáférhetző ha egyszeres, önálló adatbázis " +"módot használ. Elindíthatja\n" +" az OpenERP Szervert ezzel a lehetőséggel" #. module: base_setup #: view:base.config.settings:0 @@ -214,16 +236,18 @@ msgid "" "You will find more options in your company details: address for the header " "and footer, overdue payments texts, etc." msgstr "" +"Több lehetőséget fog találni a vállalata részleteinél: a fejléc és " +"lábjegyzet címek, határidő túllépés szöveges üzenete, stb." #. module: base_setup #: model:ir.model,name:base_setup.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: base_setup #: field:base.setup.terminology,partner:0 msgid "How do you call a Customer" -msgstr "" +msgstr "Hogy hívhat meg egy Vevőt" #. module: base_setup #: view:base.config.settings:0 @@ -237,21 +261,30 @@ msgid "" "projects,\n" " etc." msgstr "" +"Ha egy dokumentumot küld egy Vevőhöz\n" +" (árajánlat, számla), a Vevő " +"feliratkozhat\n" +" a dokumentumainak eléréséhez,\n" +" a vállalati új hírek elolvasásához, " +"projektek ellenőrzéséhez,\n" +" stb." #. module: base_setup #: model:ir.model,name:base_setup.model_base_setup_terminology msgid "base.setup.terminology" -msgstr "" +msgstr "base.setup.terminology" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Client" -msgstr "" +msgstr "Ügyfél" #. module: base_setup #: help:base.config.settings,module_portal_anonymous:0 msgid "Enable the public part of openerp, openerp becomes a public website." msgstr "" +"Az OpenERP közösségi részének bekapcsolása, OpenERP elérhetővé válik egy " +"közösségi weboldalként." #. module: base_setup #: help:sale.config.settings,module_plugin_thunderbird:0 @@ -264,22 +297,31 @@ msgid "" " Partner from the selected emails.\n" " This installs the module plugin_thunderbird." msgstr "" +"A közösség lehetővé teszi a kiválasztott OpenERP\n" +" objektumhoz tartozó e-mailek és mellékletei\n" +" archiválását. Kiválaszthat egy partnert, vagy érdeklődést és " +"\n" +" mellékelheti a kiválasztott levelet mint .eml fájl\n" +" a kiválasztott rekord mellékleteként. A CRM érdeklődésekből " +"dokumentumokat\n" +" hozhat létre, Partnert a kiválasztott e-mailekből.\n" +" Ez a plugin_thunderbird modult telepíti.." #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Partner" -msgstr "" +msgstr "Partner" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form msgid "Use another word to say \"Customer\"" -msgstr "" +msgstr "Használjon másik szót amivel kifejezi \"Vevő\"" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_sale_config #: view:sale.config.settings:0 msgid "Configure Sales" -msgstr "" +msgstr "Eladás beállítása" #. module: base_setup #: help:sale.config.settings,module_plugin_outlook:0 @@ -292,16 +334,24 @@ msgid "" " email into an OpenERP mail message with attachments.\n" " This installs the module plugin_outlook." msgstr "" +"Az Outlook plugin lehetővé teszi egy objektum kiválasztását amit\n" +" az Outlookból az e-mailhez és mellékletéhez szeretne " +"csatolni. \n" +" Kiválaszthat egy partnert vagy érdeklődés objektumot\n" +" és eltárolhatja a kiválasztott e-mailt az OpenERP " +"üzenetekhez\n" +" mellékletekkel együtt.\n" +" Ez a plugin_outlook modult telepíti." #. module: base_setup #: view:base.config.settings:0 msgid "Options" -msgstr "" +msgstr "Lehetőségek" #. module: base_setup #: field:base.config.settings,module_portal:0 msgid "Activate the customer portal" -msgstr "" +msgstr "A közösségi portál aktiválása" #. module: base_setup #: view:base.config.settings:0 @@ -310,61 +360,64 @@ msgid "" " Once activated, the login page will be " "replaced by the public website." msgstr "" +"így tenni.\n" +" Ha egyszer aktiválva van, a " +"bejelentkezési oldal ki lesz váltva a közösségi weboldallal." #. module: base_setup #: field:base.config.settings,module_share:0 msgid "Allow documents sharing" -msgstr "" +msgstr "Dokumentumok megoszásának engedélyezése" #. module: base_setup #: view:base.config.settings:0 msgid "(company news, jobs, contact form, etc.)" -msgstr "" +msgstr "(vállalati hírek, munkahelyek, kapcsolatu űrlapok, stb.)" #. module: base_setup #: field:base.config.settings,module_portal_anonymous:0 msgid "Activate the public portal" -msgstr "" +msgstr "Közösségi portál aktiválása" #. module: base_setup #: view:base.config.settings:0 msgid "Configure outgoing email servers" -msgstr "" +msgstr "Kimenő e-mail szerverek beállítása" #. module: base_setup #: view:sale.config.settings:0 msgid "Social Network Integration" -msgstr "" +msgstr "Közösségi hálózat integráció" #. module: base_setup #: help:base.config.settings,module_portal:0 msgid "Give your customers access to their documents." -msgstr "" +msgstr "Adjon hozzáférést a vevőknek a dokumentumaikhoz." #. module: base_setup #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "Cancel" -msgstr "" +msgstr "Visszavonás" #. module: base_setup #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "Apply" -msgstr "" +msgstr "Alkalmaz" #. module: base_setup #: view:base.setup.terminology:0 msgid "Specify Your Terminology" -msgstr "" +msgstr "Terminológia meghatározása" #. module: base_setup #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "or" -msgstr "" +msgstr "vagy" #. module: base_setup #: view:base.config.settings:0 msgid "Configure your company data" -msgstr "" +msgstr "A vállalata részleteinek beállítása" diff --git a/addons/base_status/i18n/hu.po b/addons/base_status/i18n/hu.po new file mode 100644 index 00000000000..d63dbcad6bd --- /dev/null +++ b/addons/base_status/i18n/hu.po @@ -0,0 +1,80 @@ +# Hungarian translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:38+0000\n" +"PO-Revision-Date: 2013-03-14 10:26+0000\n" +"Last-Translator: krnkris \n" +"Language-Team: Hungarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" + +#. module: base_status +#: code:addons/base_status/base_state.py:107 +#, python-format +msgid "Error !" +msgstr "Hiba!" + +#. module: base_status +#: code:addons/base_status/base_state.py:166 +#, python-format +msgid "%s has been opened." +msgstr "%s meg lett nyitva." + +#. module: base_status +#: code:addons/base_status/base_state.py:199 +#, python-format +msgid "%s has been renewed." +msgstr "%s meg lett újítva." + +#. module: base_status +#: code:addons/base_status/base_stage.py:210 +#, python-format +msgid "Error!" +msgstr "Hiba!" + +#. module: base_status +#: code:addons/base_status/base_state.py:107 +#, python-format +msgid "" +"You can not escalate, you are already at the top level regarding your sales-" +"team category." +msgstr "" +"Nem tud feljebb lépni, már az értékesítési csoportját illetően a legmagasabb " +"fokon áll." + +#. module: base_status +#: code:addons/base_status/base_state.py:193 +#, python-format +msgid "%s is now pending." +msgstr "%s ez nem elintézetlen." + +#. module: base_status +#: code:addons/base_status/base_state.py:187 +#, python-format +msgid "%s has been canceled." +msgstr "%s ez visszavont." + +#. module: base_status +#: code:addons/base_status/base_stage.py:210 +#, python-format +msgid "" +"You are already at the top level of your sales-team category.\n" +"Therefore you cannot escalate furthermore." +msgstr "" +"Már az értékesítési csoportjának a legmagasabb szintjén áll.\n" +"Ezért nem tud tovább feljebb lépni." + +#. module: base_status +#: code:addons/base_status/base_state.py:181 +#, python-format +msgid "%s has been closed." +msgstr "%s le lett Zárva." diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po index 5435b715b2f..1700489adbf 100644 --- a/addons/base_vat/i18n/fr.po +++ b/addons/base_vat/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-03-14 16:40+0000\n" +"Last-Translator: Quentin THEURET \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:37+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: base_vat #: view:res.partner:0 @@ -51,7 +51,7 @@ msgstr "Erreur!" #. module: base_vat #: view:res.partner:0 msgid "e.g. BE0477472701" -msgstr "" +msgstr "e.g. BE0477472701" #. module: base_vat #: help:res.partner,vat_subjected:0 diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po index 168c0b68bfd..fc957febd97 100644 --- a/addons/base_vat/i18n/hu.po +++ b/addons/base_vat/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2013-02-17 12:28+0000\n" -"Last-Translator: Balint (eSolve) \n" +"PO-Revision-Date: 2013-03-14 10:21+0000\n" +"Last-Translator: krnkris \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:37+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: base_vat #: view:res.partner:0 @@ -51,7 +51,7 @@ msgstr "Hiba!" #. module: base_vat #: view:res.partner:0 msgid "e.g. BE0477472701" -msgstr "" +msgstr "pl.: BE0477472701" #. module: base_vat #: help:res.partner,vat_subjected:0 diff --git a/addons/board/i18n/hu.po b/addons/board/i18n/hu.po index 91112f6498b..579a834b02c 100644 --- a/addons/board/i18n/hu.po +++ b/addons/board/i18n/hu.po @@ -8,58 +8,58 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-03-14 10:21+0000\n" +"Last-Translator: krnkris \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:37+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: board #: model:ir.actions.act_window,name:board.action_board_create #: model:ir.ui.menu,name:board.menu_board_create msgid "Create Board" -msgstr "" +msgstr "Vezérlőpult létrehozás" #. module: board #: view:board.create:0 msgid "Create" -msgstr "" +msgstr "Létrehozás" #. module: board #. openerp-web #: code:addons/board/static/src/xml/board.xml:4 #, python-format msgid "Reset Layout.." -msgstr "" +msgstr "Nézet visszaállítása.." #. module: board #: view:board.create:0 msgid "Create New Dashboard" -msgstr "" +msgstr "Új Dashboard/Műszerfal létrehozása" #. module: board #. openerp-web #: code:addons/board/static/src/xml/board.xml:40 #, python-format msgid "Choose dashboard layout" -msgstr "" +msgstr "Dashboard/Műszerfal nézet kiválasztása" #. module: board #. openerp-web #: code:addons/board/static/src/xml/board.xml:70 #, python-format msgid "Add" -msgstr "" +msgstr "Hozzáadás" #. module: board #. openerp-web #: code:addons/board/static/src/js/dashboard.js:139 #, python-format msgid "Are you sure you want to remove this item ?" -msgstr "" +msgstr "Biztosan el szeretné távolítani ezt az elemet?" #. module: board #: model:ir.model,name:board.model_board_board @@ -71,31 +71,31 @@ msgstr "Vezérlőpult" #: model:ir.actions.act_window,name:board.open_board_my_dash_action #: model:ir.ui.menu,name:board.menu_board_my_dash msgid "My Dashboard" -msgstr "" +msgstr "Dashboard/Műszerfalam" #. module: board #: field:board.create,name:0 msgid "Board Name" -msgstr "" +msgstr "Vezérlőpult neve" #. module: board #: model:ir.model,name:board.model_board_create msgid "Board Creation" -msgstr "" +msgstr "Vezérlőpult létrehozás" #. module: board #. openerp-web #: code:addons/board/static/src/xml/board.xml:67 #, python-format msgid "Add to Dashboard" -msgstr "" +msgstr "Hozzáadás Dashboard/Műszerfalhoz" #. module: board #. openerp-web #: code:addons/board/static/src/xml/board.xml:28 #, python-format msgid " " -msgstr "" +msgstr " " #. module: board #: model:ir.actions.act_window,help:board.open_board_my_dash_action @@ -115,13 +115,30 @@ msgid "" "
        \n" " " msgstr "" +"
        \n" +"

        \n" +" A személyes Dashboard/Műszerfala üres.\n" +"

        \n" +" Az első jelentés Dashboard/Műszerfalhoz való " +"hozzáadásához, \n" +" lépjen bármely menübe, váltson lista vagy grafikus " +"nézetre, és kattintson\n" +" a kiterjesztett keresési lehetőségeknél ide " +"'Dashboard/Műszerfalhoz hozzáadás'.\n" +"

        \n" +" Szűrheti a csoport adatokat, a keresési lehetőségekkel, " +"mielőtt \n" +" beillesztené azokat a Dashboard/Műszerfal-ba.\n" +"

        \n" +"
        \n" +" " #. module: board #. openerp-web #: code:addons/board/static/src/xml/board.xml:6 #, python-format msgid "Reset" -msgstr "" +msgstr "Visszaállítás" #. module: board #: field:board.create,menu_parent_id:0 @@ -133,35 +150,35 @@ msgstr "Főmenü" #: code:addons/board/static/src/xml/board.xml:8 #, python-format msgid "Change Layout.." -msgstr "" +msgstr "Nézet megváltoztatása.." #. module: board #. openerp-web #: code:addons/board/static/src/js/dashboard.js:93 #, python-format msgid "Edit Layout" -msgstr "" +msgstr "Nézet szerkesztése" #. module: board #. openerp-web #: code:addons/board/static/src/xml/board.xml:10 #, python-format msgid "Change Layout" -msgstr "" +msgstr "Nézet megváltoztatása" #. module: board #: view:board.create:0 msgid "Cancel" -msgstr "Mégsem" +msgstr "Visszavonás" #. module: board #: view:board.create:0 msgid "or" -msgstr "" +msgstr "vagy" #. module: board #. openerp-web #: code:addons/board/static/src/xml/board.xml:69 #, python-format msgid "Title of new dashboard item" -msgstr "" +msgstr "Az új Dashboard/Műszerfal elem neve" diff --git a/addons/claim_from_delivery/i18n/hu.po b/addons/claim_from_delivery/i18n/hu.po index 06fc106e91d..4b2a8fc7a2a 100644 --- a/addons/claim_from_delivery/i18n/hu.po +++ b/addons/claim_from_delivery/i18n/hu.po @@ -8,26 +8,26 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-03-14 10:10+0000\n" +"Last-Translator: krnkris \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:37+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: claim_from_delivery #: view:stock.picking.out:0 msgid "Claims" -msgstr "" +msgstr "Reklamációk" #. module: claim_from_delivery #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery msgid "Delivery Order" -msgstr "" +msgstr "Kézbesítési bizonylat" #. module: claim_from_delivery #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery msgid "Claim From Delivery" -msgstr "" +msgstr "Reklamáció a szállításról" diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po index 026071c32d5..81d46dd994e 100644 --- a/addons/crm/i18n/hr.po +++ b/addons/crm/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-03-14 11:52+0000\n" +"Last-Translator: Davor Bojkić \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: 2013-03-08 05:38+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: crm #: view:crm.lead.report:0 @@ -28,6 +28,8 @@ msgid "" "Allows you to configure your incoming mail server, and create leads from " "incoming emails." msgstr "" +"Omogućuje konfiguriranje dolaznoog mail poslužitelja, i kreira potencijalne " +"prodaje iz dolaznih poruka." #. module: crm #: code:addons/crm/crm_lead.py:881 @@ -134,12 +136,12 @@ msgstr "" #. module: crm #: view:crm.phonecall:0 msgid "Cancel Call" -msgstr "" +msgstr "Otkaži poziv" #. module: crm #: help:crm.lead.report,creation_day:0 msgid "Creation day" -msgstr "" +msgstr "Dan kreiranja" #. module: crm #: field:crm.segmentation.line,name:0 @@ -150,7 +152,7 @@ msgstr "Naziv pravila" #: code:addons/crm/crm_phonecall.py:280 #, python-format msgid "It's only possible to convert one phonecall at a time." -msgstr "" +msgstr "Moguće je pretvoriti samo jedan po jedan poziv." #. module: crm #: view:crm.case.resource.type:0 @@ -180,6 +182,8 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Sadrži sažetak konverzacije (broj poruka..). Ovaj sažetak je u html formatu " +"da bi mogao biti ubačen u kanban pogled." #. module: crm #: code:addons/crm/crm_lead.py:624 @@ -230,12 +234,12 @@ msgstr "" #. module: crm #: field:res.partner,meeting_count:0 msgid "# Meetings" -msgstr "" +msgstr "# Sastanaka" #. module: crm #: model:ir.actions.server,name:crm.action_email_reminder_lead msgid "Reminder to User" -msgstr "" +msgstr "Podsjetnik korisniku" #. module: crm #: field:crm.segmentation,segmentation_line:0 @@ -245,7 +249,7 @@ msgstr "Kriteriji" #. module: crm #: view:crm.lead:0 msgid "Assigned to My Team(s)" -msgstr "" +msgstr "Dodijeljen mojem timu/timovima" #. module: crm #: view:crm.segmentation:0 @@ -387,7 +391,7 @@ msgstr "" #: model:crm.case.stage,name:crm.stage_lead7 #: view:crm.lead:0 msgid "Dead" -msgstr "" +msgstr "Mrtav" #. module: crm #: field:crm.case.section,message_unread:0 @@ -395,7 +399,7 @@ msgstr "" #: field:crm.lead,message_unread:0 #: field:crm.phonecall,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Nepročitane poruke" #. module: crm #: view:crm.segmentation:0 @@ -409,7 +413,7 @@ msgstr "Segmentacija" #: selection:crm.lead2opportunity.partner.mass,action:0 #: selection:crm.partner.binding,action:0 msgid "Link to an existing customer" -msgstr "" +msgstr "Veza na postojećeg partnera" #. module: crm #: field:crm.lead,write_date:0 @@ -425,7 +429,7 @@ msgstr "Voditelj tima" #: code:addons/crm/crm_lead.py:1032 #, python-format msgid "%s a call for %s.%s" -msgstr "" +msgstr "%s poziva za %s,%s" #. module: crm #: help:crm.case.stage,probability:0 @@ -457,11 +461,12 @@ msgstr "#Prilika" msgid "" "Please select more than one element (lead or opportunity) from the list view." msgstr "" +"Molimo odaberite jedan ili više elemenata (lead ilioportunity) iz liste." #. module: crm #: field:crm.lead,partner_address_email:0 msgid "Partner Contact Email" -msgstr "" +msgstr "Kontakt email partnera" #. module: crm #: model:ir.actions.act_window,help:crm.crm_case_section_act @@ -513,7 +518,7 @@ msgstr "e-pošta" #. module: crm #: model:mail.message.subtype,description:crm.mt_lead_stage msgid "Stage changed" -msgstr "" +msgstr "Stanje izmjenjeno" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -536,7 +541,7 @@ msgstr "Planirani prihod" #: code:addons/crm/crm_lead.py:970 #, python-format msgid "Customer Email" -msgstr "" +msgstr "Email stranke" #. module: crm #: field:crm.lead,planned_revenue:0 @@ -575,7 +580,7 @@ msgstr "Sažetak" #. module: crm #: view:crm.merge.opportunity:0 msgid "Merge" -msgstr "" +msgstr "Spoji" #. module: crm #: view:crm.case.categ:0 @@ -620,7 +625,7 @@ msgstr "Šifra prodajnog tima mora biti jedinstvena!" #. module: crm #: help:crm.lead,email_from:0 msgid "Email address of the contact" -msgstr "" +msgstr "Email adresa kontakta" #. module: crm #: selection:crm.case.stage,state:0 @@ -654,7 +659,7 @@ msgstr "" #. module: crm #: field:crm.lead.report,creation_month:0 msgid "Creation Month" -msgstr "" +msgstr "Mjesec kreiranja" #. module: crm #: field:crm.case.section,resource_calendar_id:0 @@ -687,7 +692,7 @@ msgstr "Segmentacija partnera" #. module: crm #: field:crm.lead,company_currency:0 msgid "Currency" -msgstr "" +msgstr "Valuta" #. module: crm #: field:crm.lead.report,probable_revenue:0 @@ -697,7 +702,7 @@ msgstr "Očekivani Prihod" #. module: crm #: help:crm.lead.report,creation_month:0 msgid "Creation month" -msgstr "" +msgstr "Mjesec kreiranja" #. module: crm #: help:crm.segmentation,name:0 @@ -712,7 +717,7 @@ msgstr "" #. module: crm #: sql_constraint:crm.lead:0 msgid "The probability of closing the deal should be between 0% and 100%!" -msgstr "" +msgstr "Vjerojatnost sklapanja posla bi trebala biti između 0% i 100%!" #. module: crm #: view:crm.lead:0 @@ -761,7 +766,7 @@ msgstr "Zaustavi proces" #. module: crm #: field:crm.case.section,alias_id:0 msgid "Alias" -msgstr "" +msgstr "Alias" #. module: crm #: view:crm.phonecall:0 @@ -807,7 +812,7 @@ msgstr "Pretvori u prilike" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "or" -msgstr "" +msgstr "ili" #. module: crm #: field:crm.lead.report,create_date:0 @@ -841,7 +846,7 @@ msgstr "Poštanski br." #. module: crm #: view:crm.phonecall:0 msgid "Unassigned Phonecalls" -msgstr "" +msgstr "Nedodijeljeni pozivi" #. module: crm #: view:crm.lead:0 @@ -864,7 +869,7 @@ msgstr "Kategorija partnera" #. module: crm #: field:crm.lead,probability:0 msgid "Success Rate (%)" -msgstr "" +msgstr "POstotak uspjeha (%)" #. module: crm #: field:crm.segmentation,sales_purchase_active:0 @@ -911,7 +916,7 @@ msgstr "Ožujak" #. module: crm #: view:crm.lead:0 msgid "Send Email" -msgstr "" +msgstr "Pošalji e-mail" #. module: crm #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89 @@ -924,7 +929,7 @@ msgstr "Upozorenje!" #: help:crm.lead,message_unread:0 #: help:crm.phonecall,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Ako je odabrano, nove poruke zahtijevaju Vašu pažnju." #. module: crm #: field:crm.lead,day_open:0 @@ -934,7 +939,7 @@ msgstr "Dana za otvaranje" #. module: crm #: view:crm.lead:0 msgid "ZIP" -msgstr "" +msgstr "Broj pošte" #. module: crm #: field:crm.lead,mobile:0 @@ -950,7 +955,7 @@ msgstr "Oznaka" #. module: crm #: help:crm.case.section,resource_calendar_id:0 msgid "Used to compute open days" -msgstr "" +msgstr "Koristi se za izračun otvorenih dana" #. module: crm #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new @@ -998,7 +1003,7 @@ msgstr "Predmet" #. module: crm #: view:crm.lead:0 msgid "Show Sales Team" -msgstr "" +msgstr "Prikaži prodajni tim" #. module: crm #: help:sale.config.settings,module_crm_claim:0 @@ -1066,7 +1071,7 @@ msgstr "Iznos nabave" #. module: crm #: view:crm.phonecall.report:0 msgid "Year of call" -msgstr "" +msgstr "Godina poziva" #. module: crm #: view:crm.lead:0 @@ -1085,7 +1090,7 @@ msgstr "Stupanj" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone Calls that are assigned to me" -msgstr "" +msgstr "Telefonski pozivi dodijeljeni meni" #. module: crm #: field:crm.lead,user_login:0 @@ -1095,12 +1100,12 @@ msgstr "Prijava korisnika" #. module: crm #: view:crm.lead:0 msgid "No salesperson" -msgstr "" +msgstr "Nema prodavača" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in pending state" -msgstr "" +msgstr "Pozivi u stanju čekanja" #. module: crm #: view:crm.case.section:0 @@ -1122,7 +1127,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Delete" -msgstr "" +msgstr "Briši" #. module: crm #: model:mail.message.subtype,description:crm.mt_lead_create @@ -1137,7 +1142,7 @@ msgstr "" #. module: crm #: view:crm.phonecall:0 msgid "Description..." -msgstr "" +msgstr "Opis" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -1251,7 +1256,7 @@ msgstr "Status izvršenja" #. module: crm #: view:crm.opportunity2phonecall:0 msgid "Log call" -msgstr "" +msgstr "Zabilježi poziv" #. module: crm #: field:crm.lead,day_close:0 @@ -1268,7 +1273,7 @@ msgstr "nepoznato" #: field:crm.lead,message_is_follower:0 #: field:crm.phonecall,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Pratitelj" #. module: crm #: field:crm.opportunity2phonecall,date:0 @@ -1281,7 +1286,7 @@ msgstr "Datum" #. module: crm #: model:crm.case.section,name:crm.crm_case_section_4 msgid "Online Support" -msgstr "" +msgstr "Online podrška" #. module: crm #: view:crm.lead.report:0 @@ -1292,7 +1297,7 @@ msgstr "Prošireni filtri..." #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in closed state" -msgstr "" +msgstr "Pozivi u stanju zatvoreno" #. module: crm #: view:crm.phonecall.report:0 @@ -1356,7 +1361,7 @@ msgstr "Šifra" #. module: crm #: view:sale.config.settings:0 msgid "Features" -msgstr "" +msgstr "Mogućnosti" #. module: crm #: field:crm.case.section,child_ids:0 @@ -1366,12 +1371,12 @@ msgstr "Podređeni Timovi" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls which are in draft and open state" -msgstr "" +msgstr "Pozivi u stanju nacrt ili otvoreno" #. module: crm #: field:crm.lead2opportunity.partner.mass,user_ids:0 msgid "Salesmen" -msgstr "" +msgstr "Podavač" #. module: crm #: view:crm.lead:0 @@ -1391,7 +1396,7 @@ msgstr "Odustani" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor4 msgid "Information" -msgstr "" +msgstr "Informacija" #. module: crm #: view:crm.lead.report:0 @@ -1413,7 +1418,7 @@ msgstr "" #: field:crm.lead2opportunity.partner.mass,action:0 #: field:crm.partner.binding,action:0 msgid "Related Customer" -msgstr "" +msgstr "Povezani partner" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor8 @@ -1455,7 +1460,7 @@ msgstr "" #. module: crm #: model:mail.message.subtype,name:crm.mt_lead_stage msgid "Stage Changed" -msgstr "" +msgstr "Stanje izmjenjeno" #. module: crm #: field:crm.case.stage,section_ids:0 @@ -1471,7 +1476,7 @@ msgstr "Greška ! Ne možete kreirati rekurzivne prodajne timove." #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 msgid "Log a call" -msgstr "" +msgstr "Zabilježi poziv" #. module: crm #: selection:crm.segmentation.line,expr_name:0 @@ -1521,12 +1526,12 @@ msgstr "Moji slučajevi" #: help:crm.lead,message_ids:0 #: help:crm.phonecall,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Poruke i povijest komunikacije" #. module: crm #: view:crm.lead:0 msgid "Show Countries" -msgstr "" +msgstr "Pokaži države" #. module: crm #: view:crm.phonecall.report:0 @@ -1623,7 +1628,7 @@ msgstr "Ulazni" #. module: crm #: view:crm.phonecall.report:0 msgid "Month of call" -msgstr "" +msgstr "Mjesec poziva" #. module: crm #: view:crm.lead:0 @@ -1634,12 +1639,12 @@ msgstr "" #: code:addons/crm/crm_phonecall.py:290 #, python-format msgid "Partner has been created." -msgstr "" +msgstr "Partner je kreiran." #. module: crm #: field:sale.config.settings,module_crm_claim:0 msgid "Manage Customer Claims" -msgstr "" +msgstr "Upravljanje zahtjevima klijenata" #. module: crm #: model:ir.actions.act_window,help:crm.action_report_crm_lead @@ -1652,7 +1657,7 @@ msgstr "" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor3 msgid "Services" -msgstr "" +msgstr "Usluge" #. module: crm #: selection:crm.lead,priority:0 @@ -1665,7 +1670,7 @@ msgstr "Najviši" #. module: crm #: help:crm.lead.report,creation_year:0 msgid "Creation year" -msgstr "" +msgstr "Godina kreiranja" #. module: crm #: view:crm.case.section:0 @@ -1676,7 +1681,7 @@ msgstr "Bilješke" #. module: crm #: view:crm.opportunity2phonecall:0 msgid "Call Description" -msgstr "" +msgstr "Opis poziva" #. module: crm #: field:crm.lead,partner_name:0 @@ -1691,7 +1696,7 @@ msgstr "Reply-To" #. module: crm #: view:crm.lead:0 msgid "Display" -msgstr "" +msgstr "Prikaži" #. module: crm #: view:board.board:0 @@ -1727,12 +1732,12 @@ msgstr "Dodatni podaci" #. module: crm #: view:crm.lead:0 msgid "Fund Raising" -msgstr "" +msgstr "Prikupljanje sredstava" #. module: crm #: view:crm.lead:0 msgid "Edit..." -msgstr "" +msgstr "Uredi ..." #. module: crm #: model:crm.case.resource.type,name:crm.type_lead5 @@ -1770,7 +1775,7 @@ msgstr "" #: view:crm.payment.mode:0 #: model:ir.actions.act_window,name:crm.action_crm_payment_mode msgid "Payment Mode" -msgstr "" +msgstr "Način plaćanja" #. module: crm #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass @@ -1786,7 +1791,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.open_board_statistical_dash #: model:ir.ui.menu,name:crm.menu_board_statistics_dash msgid "CRM" -msgstr "" +msgstr "CRM" #. module: crm #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act @@ -1846,7 +1851,7 @@ msgstr "Potencijal / Kupac" #. module: crm #: model:crm.case.section,name:crm.crm_case_section_2 msgid "Support Department" -msgstr "" +msgstr "Odjel podrške" #. module: crm #: view:crm.lead.report:0 @@ -1910,7 +1915,7 @@ msgstr "" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor5 msgid "Design" -msgstr "" +msgstr "Dizajn" #. module: crm #: selection:crm.lead2opportunity.partner,name:0 @@ -1988,7 +1993,7 @@ msgstr "Na čekanju" #. module: crm #: view:crm.lead:0 msgid "Assigned to Me" -msgstr "" +msgstr "Dodijeljeno meni" #. module: crm #: model:process.transition,name:crm.process_transition_leadopportunity0 @@ -2012,7 +2017,7 @@ msgstr "Telefonski pozivi" #. module: crm #: view:crm.case.stage:0 msgid "Stage Search" -msgstr "" +msgstr "Pretraga faza" #. module: crm #: help:crm.lead.report,delay_open:0 @@ -2047,7 +2052,7 @@ msgstr "Obavezan izraz" #: selection:crm.lead2opportunity.partner.mass,action:0 #: selection:crm.partner.binding,action:0 msgid "Create a new customer" -msgstr "" +msgstr "Kreiraj novog klijenta" #. module: crm #: field:crm.lead.report,deadline_day:0 @@ -2057,7 +2062,7 @@ msgstr "" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor2 msgid "Software" -msgstr "" +msgstr "Software" #. module: crm #: field:crm.case.section,change_responsible:0 @@ -2092,12 +2097,12 @@ msgstr "Grad" #. module: crm #: selection:crm.case.stage,type:0 msgid "Both" -msgstr "" +msgstr "Oboje" #. module: crm #: view:crm.phonecall:0 msgid "Call Done" -msgstr "" +msgstr "Poziv obavljen" #. module: crm #: view:crm.phonecall:0 @@ -2108,17 +2113,17 @@ msgstr "Odgovoran" #. module: crm #: model:crm.case.section,name:crm.crm_case_section_3 msgid "Direct Marketing" -msgstr "" +msgstr "Direktni marketing" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor1 msgid "Product" -msgstr "" +msgstr "Proizvod" #. module: crm #: field:crm.lead.report,creation_year:0 msgid "Creation Year" -msgstr "" +msgstr "Godina kreiranja" #. module: crm #: view:crm.lead2opportunity.partner.mass:0 @@ -2135,7 +2140,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Address" -msgstr "" +msgstr "Adresa" #. module: crm #: view:crm.lead:0 @@ -2301,17 +2306,17 @@ msgstr "Naziv objekta" #. module: crm #: view:crm.phonecall:0 msgid "Phone Calls Assigned to Me or My Team(s)" -msgstr "" +msgstr "Telefonski pozivi dodijeljeni meni ili mojem timu/timovima" #. module: crm #: view:crm.lead:0 msgid "Reset" -msgstr "" +msgstr "Poništi" #. module: crm #: view:sale.config.settings:0 msgid "After-Sale Services" -msgstr "" +msgstr "Usluge postprodaje" #. module: crm #: field:crm.case.section,message_ids:0 @@ -2343,7 +2348,7 @@ msgstr "Otkazani" #. module: crm #: view:crm.lead:0 msgid "Street..." -msgstr "" +msgstr "Ulica..." #. module: crm #: field:crm.lead.report,date_closed:0 @@ -2372,7 +2377,7 @@ msgstr "" #. module: crm #: field:crm.case.stage,state:0 msgid "Related Status" -msgstr "" +msgstr "Povezani status" #. module: crm #: field:crm.phonecall,name:0 @@ -2423,7 +2428,7 @@ msgstr "Potvrdi" #. module: crm #: view:crm.lead:0 msgid "Unread messages" -msgstr "" +msgstr "Nepročitane poruke" #. module: crm #: field:crm.phonecall.report,section_id:0 @@ -2440,7 +2445,7 @@ msgstr "Opcijski Izraz" #: field:crm.lead,message_follower_ids:0 #: field:crm.phonecall,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Pratitelji" #. module: crm #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all @@ -2514,7 +2519,7 @@ msgstr "Kreiranje poslovnih prilika iz pot. kontakata" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead3 msgid "Email Campaign - Products" -msgstr "" +msgstr "Email kampanja - Proizvodi" #. module: crm #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0 @@ -2542,7 +2547,7 @@ msgstr "Inicijalni kontakt s novim potencijalnim kontaktom" #. module: crm #: view:res.partner:0 msgid "Calls" -msgstr "" +msgstr "Pozivi" #. module: crm #: view:crm.lead:0 @@ -2557,7 +2562,7 @@ msgstr "Automatski promijeni vjerojatnost" #. module: crm #: view:crm.phonecall.report:0 msgid "My Phone Calls" -msgstr "" +msgstr "Moji pozivi" #. module: crm #: model:crm.case.stage,name:crm.stage_lead3 @@ -2613,7 +2618,7 @@ msgstr "Prosinac" #. module: crm #: view:crm.phonecall:0 msgid "Date of Call" -msgstr "" +msgstr "Datum poziva" #. module: crm #: view:crm.lead:0 @@ -2644,7 +2649,7 @@ msgstr "" #. module: crm #: model:ir.actions.client,name:crm.action_client_crm_menu msgid "Open Sale Menu" -msgstr "" +msgstr "Otvori izbornik Prodaja" #. module: crm #: field:crm.lead,date_open:0 @@ -2662,7 +2667,7 @@ msgstr "Team Members" #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule/Log a Call" -msgstr "" +msgstr "Zakaži/zabilježi poziv" #. module: crm #: field:crm.lead,planned_cost:0 @@ -2688,7 +2693,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound msgid "Logged Calls" -msgstr "" +msgstr "Zabilježeni pozivi" #. module: crm #: model:mail.message.subtype,name:crm.mt_lead_won @@ -2735,7 +2740,7 @@ msgstr "Ulica2" #. module: crm #: field:sale.config.settings,module_crm_helpdesk:0 msgid "Manage Helpdesk and Support" -msgstr "" +msgstr "Upravljanje helpdeskom i podrškom" #. module: crm #: field:crm.lead.report,delay_open:0 @@ -2781,7 +2786,7 @@ msgstr "Twitter Ads" #. module: crm #: field:crm.lead.report,creation_day:0 msgid "Creation Day" -msgstr "" +msgstr "Dan kreiranja" #. module: crm #: view:crm.lead.report:0 @@ -2791,7 +2796,7 @@ msgstr "Planned Revenues" #. module: crm #: help:crm.lead.report,deadline_year:0 msgid "Expected closing year" -msgstr "" +msgstr "Očekivana godina zatvaranja" #. module: crm #: view:crm.lead:0 @@ -2812,13 +2817,13 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Unassigned" -msgstr "" +msgstr "Nedodjeljen" #. module: crm #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 msgid "Schedule a call" -msgstr "" +msgstr "Zakaži poziv" #. module: crm #: view:crm.lead:0 @@ -2828,7 +2833,7 @@ msgstr "Kategorizacija" #. module: crm #: view:crm.phonecall2phonecall:0 msgid "Log Call" -msgstr "" +msgstr "Zabilježi poziv" #. module: crm #: help:sale.config.settings,group_fund_raising:0 @@ -2844,12 +2849,12 @@ msgstr "Tel.poziv" #. module: crm #: view:crm.phonecall.report:0 msgid "Phone calls that are assigned to one of the sale teams I manage" -msgstr "" +msgstr "Pozivi dodijeljeni jednom od prodajnih timova koje vodim" #. module: crm #: view:crm.lead:0 msgid "at" -msgstr "" +msgstr "na" #. module: crm #: model:crm.case.stage,name:crm.stage_lead1 @@ -2918,7 +2923,7 @@ msgstr "" #. module: crm #: view:crm.lead:0 msgid "Internal Notes" -msgstr "" +msgstr "Interne bilješke" #. module: crm #: view:crm.lead:0 diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po index 77228dd2d27..2140aee9234 100644 --- a/addons/crm/i18n/hu.po +++ b/addons/crm/i18n/hu.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:36+0000\n" -"PO-Revision-Date: 2013-03-13 16:12+0000\n" +"PO-Revision-Date: 2013-03-14 10:27+0000\n" "Last-Translator: krnkris \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-14 05:34+0000\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" "X-Generator: Launchpad (build 16532)\n" #. module: crm @@ -83,7 +83,7 @@ msgstr "Lehetőségek kiválasztása" #: model:res.groups,name:crm.group_fund_raising #: field:sale.config.settings,group_fund_raising:0 msgid "Manage Fund Raising" -msgstr "" +msgstr "Tőkebevonás kezelése" #. module: crm #: view:crm.lead.report:0 @@ -234,7 +234,7 @@ msgstr "Kilép" #. module: crm #: view:crm.lead:0 msgid "Opportunities that are assigned to me" -msgstr "" +msgstr "Hozzám iktatott lehetőségek" #. module: crm #: field:res.partner,meeting_count:0 @@ -363,7 +363,7 @@ msgstr "Kapcsolat" msgid "" "When escalating to this team override the salesman with the team leader." msgstr "" -"Ha kiterjeszti erre a csoportra akkor felülírja az értékesítőt a csoport " +"Ha feljebb lép erre a csoportra akkor felülírja az értékesítőt a csoport " "vezetővel." #. module: crm @@ -472,6 +472,8 @@ msgid "" "This percentage depicts the default/average probability of the Case for this " "stage to be a success" msgstr "" +"Ez a százalék megadja az alapértelmezett/átlagos valószínűségét annak, hogy " +"mennyire lesz sikeres az ebben a szakaszban lévő ügy" #. module: crm #: view:crm.lead:0 @@ -528,7 +530,7 @@ msgstr "" #. module: crm #: model:process.transition,note:crm.process_transition_opportunitymeeting0 msgid "Normal or phone meeting for opportunity" -msgstr "" +msgstr "Normál vagy telefonos találkozó lehetőségre" #. module: crm #: field:crm.lead,state:0 @@ -552,7 +554,7 @@ msgstr "Beállítás" #. module: crm #: view:crm.lead:0 msgid "Escalate" -msgstr "Fokozat" +msgstr "Feljebb lépés" #. module: crm #: view:crm.lead:0 @@ -613,6 +615,11 @@ msgid "" " If the call needs to be done then the status is set " "to 'Not Held'." msgstr "" +"Az állapot 'Tennivaló' állapotú, amikor az ügy létre lett hozva. " +" Ha az ügy folyamatban van akkor annak állapot be lesz " +"állítva mint 'Nyitott'. Ha a hívásnak vége, " +"akkor az állapota 'Tartásban'. Ha a hívást el " +"kell végezni akkor az állapota 'Ne tartsd'." #. module: crm #: field:crm.case.section,message_summary:0 @@ -652,11 +659,13 @@ msgid "" "No customer name defined. Please fill one of the following fields: Company " "Name, Contact Name or Email (\"Name \")" msgstr "" +"Nincs vevő név meghatározva. Kérem kitölteni egy mezőt ezek közül: Vállalat " +"neve, Kapcsolat neve vagy e-mail címe (\"Name \")" #. module: crm #: view:crm.segmentation:0 msgid "Profiling Options" -msgstr "" +msgstr "Körvonalazási beállítások" #. module: crm #: view:crm.phonecall.report:0 @@ -707,6 +716,9 @@ msgid "" "The email address put in the 'Reply-To' of all emails sent by OpenERP about " "cases in this sales team" msgstr "" +"Az e-mail cím az összes OpenERP által kiküldött levélhez, amit ez az " +"értékesítési csoport erre az ügyre használni fog a 'Válasz erre a címre' e-" +"mail címre mezőben." #. module: crm #: field:crm.lead.report,creation_month:0 @@ -1033,7 +1045,7 @@ msgstr "Következő művelet" #: code:addons/crm/crm_lead.py:763 #, python-format msgid "Partner set to %s." -msgstr "" +msgstr "Partner beállítva mint %s." #. module: crm #: selection:crm.lead.report,state:0 @@ -1068,6 +1080,9 @@ msgid "" "Allows you to track your customers/suppliers claims and grievances.\n" " This installs the module crm_claim." msgstr "" +"Lehetővé teszi a Vevők/Beszállítók Reklamációs igényeinek és panaszainak " +"nyomon követését.\n" +" Ez a crm_claim modult telepíti." #. module: crm #: model:crm.case.stage,name:crm.stage_lead6 @@ -1152,7 +1167,7 @@ msgstr "Részemre kiosztott telefonhívások" #. module: crm #: field:crm.lead,user_login:0 msgid "User Login" -msgstr "" +msgstr "Felhasználói belépés" #. module: crm #: view:crm.lead:0 @@ -1180,6 +1195,8 @@ msgid "" "Allows you to communicate with Customer, process Customer query, and " "provide better help and support. This installs the module crm_helpdesk." msgstr "" +"Lehetővé teszi a kommunikációt a vevőkkel, Vevői igény feldolgozását, és " +"jobb segítség és támogatás ellátását. Ez a crm_helpdesk modult telepíti." #. module: crm #: view:crm.lead:0 @@ -1242,7 +1259,7 @@ msgstr "" #. module: crm #: field:crm.segmentation,partner_id:0 msgid "Max Partner ID processed" -msgstr "" +msgstr "Max partner ID azonosító feldolgzva" #. module: crm #: help:crm.case.stage,on_change:0 @@ -1250,11 +1267,13 @@ msgid "" "Setting this stage will change the probability automatically on the " "opportunity." msgstr "" +"Ennek a szakasznak a beállítása automatikusan megváltoztatja ennek a " +"lehetőségnek a valószínűségét ." #. module: crm #: view:crm.lead:0 msgid "oe_kanban_text_red" -msgstr "" +msgstr "oe_kanban_text_red" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act @@ -1585,6 +1604,11 @@ msgid "" "mainly used by the sales manager in order to do the periodic review with the " "teams of the sales pipeline." msgstr "" +"Lehetőség elemzés azonnali hozzáférést biztosít a lehetőségek " +"információihoz, mint az elvárt árbevétel, tervezett költség, túlhaladt " +"határidők vagy a lehetőségenkénti kölcsönhatások. Ezeket a jelentéseket " +"főként az értékesítési vezetők használják az értékesítési folyamat " +"csoportokkal történő időszaki árvizsgálatára." #. module: crm #: field:crm.case.categ,name:0 @@ -1696,6 +1720,9 @@ msgid "" "stage. For example, if a stage is related to the status 'Close', when your " "document reaches this stage, it is automatically closed." msgstr "" +"A dokumentuma állapota automatikusan változni fog a kiválasztott szakasz " +"szerint. Például, a szakasza 'Lezárt' állapottal függ össze, és ezt a " +"szakaszt eléri a dokumentuma, akkor az automatikusan le lesz zárva." #. module: crm #: view:crm.lead2opportunity.partner.mass:0 @@ -1726,7 +1753,7 @@ msgstr "Partner létrehozva." #. module: crm #: field:sale.config.settings,module_crm_claim:0 msgid "Manage Customer Claims" -msgstr "Jótállási ügyek intézése" +msgstr "Reklamációs ügyek intézése" #. module: crm #: model:ir.actions.act_window,help:crm.action_report_crm_lead @@ -1849,7 +1876,7 @@ msgstr "Prioritás" #. module: crm #: model:ir.model,name:crm.model_crm_lead2opportunity_partner msgid "Lead To Opportunity Partner" -msgstr "" +msgstr "Érdeklődés a partner lehetőségre" #. module: crm #: help:crm.lead,partner_id:0 @@ -1868,7 +1895,7 @@ msgstr "Fizetési mód" #. module: crm #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass msgid "Mass Lead To Opportunity Partner" -msgstr "" +msgstr "Tömeges érdeklődés a partner lehetőségre" #. module: crm #: view:sale.config.settings:0 @@ -2157,7 +2184,7 @@ msgstr "Szoftver" #. module: crm #: field:crm.case.section,change_responsible:0 msgid "Reassign Escalated" -msgstr "" +msgstr "Újraiktatás feljebbléptetve" #. module: crm #: view:crm.lead.report:0 @@ -2407,7 +2434,7 @@ msgstr "Érdeklődés átalakítva egy lehetőséggé" #. module: crm #: model:mail.message.subtype,description:crm.mt_lead_won msgid "Opportunity won" -msgstr "" +msgstr "Lehetőség megnyerve" #. module: crm #: field:crm.case.categ,object_id:0 @@ -2417,7 +2444,7 @@ msgstr "Tárgy neve" #. module: crm #: view:crm.phonecall:0 msgid "Phone Calls Assigned to Me or My Team(s)" -msgstr "" +msgstr "Részemre vagy a csoportom részére iktatott telefonhívások" #. module: crm #: view:crm.lead:0 @@ -2475,6 +2502,10 @@ msgid "" "several criteria and drill down the information, by adding more groups in " "the report." msgstr "" +"Ebből a jelentésből, az értékesítési csoportjának a teljesítményét " +"elemezheti, a telefonhívásaik alapján. Csoportosíthatja vagy szűrheti az " +"információkat egy pár kritérium szerint és leáshat az információkban új " +"csoportok hozzáadásával." #. module: crm #: field:crm.case.stage,fold:0 @@ -2520,7 +2551,7 @@ msgstr "Megerősítve" #. module: crm #: model:ir.model,name:crm.model_crm_partner_binding msgid "Handle partner binding or generation in CRM wizards." -msgstr "" +msgstr "Partner kikötés vagy létrehozás a CMR varázslókban." #. module: crm #: model:ir.actions.act_window,name:crm.act_oppor_stage_user @@ -2571,6 +2602,22 @@ msgid "" "

        \n" " " msgstr "" +"

        \n" +" Kattintson egy rögzítetlen érdeklődés létrehozásához.\n" +"

        \n" +" Használja az érdeklődéseket, ha rögzítési lépésre van szüksége " +"egy lehetőség\n" +" vagy egy vevő létrehozása előtt. Ez lehet egy kézhez kapott " +"névjegykártya,\n" +" egy, a weboldalon kitöltött, kapcsolati űrlap, vagy egy ön által " +"rögzítetlen\n" +" betöltött prospektus, stb.\n" +"

        \n" +" Ha rögzítésre került, az érdeklődést át lehet alakítani üzleti " +"lehetőségekké\n" +" és/vagy új vevővé a címjegyzékében.\n" +"

        \n" +" " #. module: crm #: field:sale.config.settings,fetchmail_lead:0 @@ -2682,7 +2729,7 @@ msgstr "Valószínűség automatikus változtatása" #. module: crm #: view:crm.phonecall.report:0 msgid "My Phone Calls" -msgstr "" +msgstr "Telefonhívásaim" #. module: crm #: model:crm.case.stage,name:crm.stage_lead3 @@ -2709,6 +2756,18 @@ msgid "" "

        \n" " " msgstr "" +"

        \n" +" Kattintson új szakasz címke meghatározásához.\n" +"

        \n" +" Jellemző címkék létrehozása a vállalata tevékenységeinek " +"megfelelően\n" +" az érdeklődések és lehetőségek jobb csoportosításához és " +"elemzéséhez.\n" +" Ilyen kategóriák például kifejezhetik a termék szerkezetét \n" +" vagy az Ön által létrehozott különböző típusú " +"értékesítéseket.\n" +"

        \n" +" " #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -2721,12 +2780,12 @@ msgstr "Augusztus" #: model:mail.message.subtype,name:crm.mt_lead_lost #: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost msgid "Opportunity Lost" -msgstr "" +msgstr "Lehetőség elveszítve" #. module: crm #: field:crm.lead.report,deadline_month:0 msgid "Exp. Closing Month" -msgstr "" +msgstr "Várh. lejárat hónapja" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -2738,7 +2797,7 @@ msgstr "December" #. module: crm #: view:crm.phonecall:0 msgid "Date of Call" -msgstr "" +msgstr "Hívás időpontja" #. module: crm #: view:crm.lead:0 @@ -2749,7 +2808,7 @@ msgstr "Várható befejezése" #. module: crm #: model:ir.model,name:crm.model_crm_opportunity2phonecall msgid "Opportunity to Phonecall" -msgstr "" +msgstr "Lehetőség a telefonhíváshoz" #. module: crm #: view:crm.segmentation:0 @@ -2764,12 +2823,12 @@ msgstr "Találkozó ütemezése" #. module: crm #: field:crm.lead.report,deadline_year:0 msgid "Ex. Closing Year" -msgstr "" +msgstr "Várh. lejárat éve" #. module: crm #: model:ir.actions.client,name:crm.action_client_crm_menu msgid "Open Sale Menu" -msgstr "" +msgstr "Értékesítési menü megnyitása" #. module: crm #: field:crm.lead,date_open:0 @@ -2781,13 +2840,13 @@ msgstr "Nyitott" #: view:crm.case.section:0 #: field:crm.case.section,member_ids:0 msgid "Team Members" -msgstr "" +msgstr "Csoport tag" #. module: crm #: view:crm.opportunity2phonecall:0 #: view:crm.phonecall2phonecall:0 msgid "Schedule/Log a Call" -msgstr "" +msgstr "Egy hívás Ütemezése/Naplózása" #. module: crm #: field:crm.lead,planned_cost:0 @@ -2797,7 +2856,7 @@ msgstr "Tervezett költségek" #. module: crm #: help:crm.lead,date_deadline:0 msgid "Estimate of the date on which the opportunity will be won." -msgstr "" +msgstr "A lehetőség elnyerésének körülbelüli időpontja/dátuma." #. module: crm #: help:crm.lead,email_cc:0 @@ -2806,6 +2865,9 @@ msgid "" "outbound emails for this record before being sent. Separate multiple email " "addresses with a comma" msgstr "" +"Ezek az email címek lesznek hozzáadva a CC /Carbon copy,másolat/ mezőhöz " +"minden bejövő és kimenő email-hez amit ezzel a feljegyzéssel küld. Több " +"email felsorolását vesszővel elválasztva adja meg." #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0 @@ -2817,7 +2879,7 @@ msgstr "Naplózott hívások" #: model:mail.message.subtype,name:crm.mt_lead_won #: model:mail.message.subtype,name:crm.mt_salesteam_lead_won msgid "Opportunity Won" -msgstr "" +msgstr "Lehetőség elfogadva" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree @@ -2858,12 +2920,12 @@ msgstr "Utca2" #. module: crm #: field:sale.config.settings,module_crm_helpdesk:0 msgid "Manage Helpdesk and Support" -msgstr "" +msgstr "Ügyfélszolgálat és támogatás kezelése" #. module: crm #: field:crm.lead.report,delay_open:0 msgid "Delay to Open" -msgstr "" +msgstr "Nyitás késleltetése" #. module: crm #: field:crm.lead.report,user_id:0 @@ -2899,12 +2961,12 @@ msgstr "Szerződés" #. module: crm #: model:crm.case.resource.type,name:crm.type_lead4 msgid "Twitter Ads" -msgstr "" +msgstr "Twitter hirdetések" #. module: crm #: field:crm.lead.report,creation_day:0 msgid "Creation Day" -msgstr "" +msgstr "Létrehozás napja" #. module: crm #: view:crm.lead.report:0 @@ -2914,12 +2976,12 @@ msgstr "Tervezett bevételek" #. module: crm #: help:crm.lead.report,deadline_year:0 msgid "Expected closing year" -msgstr "" +msgstr "Várható befejezés éve" #. module: crm #: view:crm.lead:0 msgid "e.g. Call for proposal" -msgstr "" +msgstr "pl.: Felhívás egy javaslattételre" #. module: crm #: model:ir.model,name:crm.model_crm_case_stage @@ -2935,7 +2997,7 @@ msgstr "Egyesített lehetőség" #. module: crm #: view:crm.lead:0 msgid "Unassigned" -msgstr "" +msgstr "Nem hozzárendelt" #. module: crm #: selection:crm.opportunity2phonecall,action:0 @@ -2951,12 +3013,13 @@ msgstr "Kategorizálás" #. module: crm #: view:crm.phonecall2phonecall:0 msgid "Log Call" -msgstr "" +msgstr "Telefonhívás naplózása" #. module: crm #: help:sale.config.settings,group_fund_raising:0 msgid "Allows you to trace and manage your activities for fund raising." msgstr "" +"Lehetővé teszi a tőkebevonás műveletek kezelését és nyomon követését." #. module: crm #: field:crm.meeting,phonecall_id:0 @@ -2968,11 +3031,12 @@ msgstr "Telefonhívás" #: view:crm.phonecall.report:0 msgid "Phone calls that are assigned to one of the sale teams I manage" msgstr "" +"Telefon hívások melyeket az általam kezelt értékesítési csoporthoz iktattak" #. module: crm #: view:crm.lead:0 msgid "at" -msgstr "" +msgstr "ekkor" #. module: crm #: model:crm.case.stage,name:crm.stage_lead1 @@ -3037,16 +3101,30 @@ msgid "" "

        \n" " " msgstr "" +"

        \n" +" Kattintson új csatorna meghatározásához.\n" +"

        \n" +" Használja a csatornákat az érdeklődések és lehetőségek " +"forrásainak\n" +" nyomon követéséhez. A csatornákat legtöbbször\n" +" az értékesítési törekvésekkel összefüggő eladási " +"teljesítmények elemzésére\n" +" használják.\n" +"

        \n" +" Pár példa a csatornákra: Vállalati weboldal, telefonos\n" +" kampány, viszonteladó, stb.\n" +"

        \n" +" " #. module: crm #: view:crm.lead:0 msgid "Internal Notes" -msgstr "" +msgstr "Belső megjegyzések" #. module: crm #: view:crm.lead:0 msgid "New Opportunities" -msgstr "" +msgstr "Új lehetőségek" #. module: crm #: field:crm.segmentation.line,operator:0 @@ -3066,7 +3144,7 @@ msgstr "Előterjesztette" #. module: crm #: view:crm.phonecall:0 msgid "Reset to Todo" -msgstr "" +msgstr "Tennivalók visszaállítása" #. module: crm #: field:crm.case.section,working_hours:0 @@ -3099,13 +3177,14 @@ msgstr "Találkozó ütemezése" #: model:crm.case.stage,name:crm.stage_lead8 #: view:crm.lead:0 msgid "Lost" -msgstr "" +msgstr "Elveszett" #. module: crm #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89 #, python-format msgid "Closed/Cancelled leads cannot be converted into opportunities." msgstr "" +"Lezárt/Visszavont érdeklődéseket nem lehet átalakítani lehetőségekké ." #. module: crm #: view:crm.lead:0 @@ -3158,7 +3237,7 @@ msgstr "Tárgyalás" #. module: crm #: model:ir.model,name:crm.model_crm_phonecall2phonecall msgid "Phonecall To Phonecall" -msgstr "" +msgstr "Telefonhívás a telefonhíváshoz" #. module: crm #: field:crm.case.stage,sequence:0 @@ -3168,7 +3247,7 @@ msgstr "Sorszám" #. module: crm #: field:crm.segmentation.line,expr_name:0 msgid "Control Variable" -msgstr "" +msgstr "Változó irányítása" #. module: crm #: model:crm.case.stage,name:crm.stage_lead4 diff --git a/addons/document_page/i18n/hr.po b/addons/document_page/i18n/hr.po index c40f3593902..2461dff7a05 100644 --- a/addons/document_page/i18n/hr.po +++ b/addons/document_page/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-03-14 12:05+0000\n" +"Last-Translator: Davor Bojkić \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: 2013-03-08 05:41+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: document_page #: view:document.page:0 @@ -23,7 +23,7 @@ msgstr "" #: selection:document.page,type:0 #: model:ir.actions.act_window,name:document_page.action_category msgid "Category" -msgstr "" +msgstr "Kategorija" #. module: document_page #: view:document.page:0 @@ -46,7 +46,7 @@ msgstr "Izbornik" #: view:document.page:0 #: model:ir.model,name:document_page.model_document_page msgid "Document Page" -msgstr "" +msgstr "Stranica dokumenata" #. module: document_page #: model:ir.actions.act_window,name:document_page.action_related_page_history @@ -69,13 +69,15 @@ msgstr "Grupiraj po..." #. module: document_page #: view:document.page:0 msgid "Template" -msgstr "" +msgstr "Predložak" #. module: document_page #: view:document.page:0 msgid "" "that will be used as a content template for all new page of this category." msgstr "" +"ovo će biti korišteno kao predložak sadržaja za sve nove stranice u ovoj " +"kategoriji." #. module: document_page #: field:document.page,name:0 @@ -90,7 +92,7 @@ msgstr "Wizard Create Menu" #. module: document_page #: field:document.page,type:0 msgid "Type" -msgstr "" +msgstr "Tip" #. module: document_page #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff @@ -100,17 +102,17 @@ msgstr "" #. module: document_page #: field:document.page.history,create_uid:0 msgid "Modified By" -msgstr "" +msgstr "Izmjenio" #. module: document_page #: view:document.page.create.menu:0 msgid "or" -msgstr "" +msgstr "ili" #. module: document_page #: help:document.page,type:0 msgid "Page type" -msgstr "" +msgstr "Tip stranice" #. module: document_page #: view:document.page.create.menu:0 @@ -121,18 +123,18 @@ msgstr "Informacije o izborniku" #: view:document.page.history:0 #: model:ir.model,name:document_page.model_document_page_history msgid "Document Page History" -msgstr "" +msgstr "Povijest stranica Dokumenata" #. module: document_page #: model:ir.ui.menu,name:document_page.menu_page_history msgid "Pages history" -msgstr "" +msgstr "Povijest stranice" #. module: document_page #: code:addons/document_page/document_page.py:129 #, python-format msgid "There are no changes in revisions." -msgstr "" +msgstr "Nema izmjena u revizijama" #. module: document_page #: field:document.page.history,create_date:0 @@ -156,12 +158,12 @@ msgstr "Stranice" #. module: document_page #: model:ir.ui.menu,name:document_page.menu_category msgid "Categories" -msgstr "" +msgstr "Kategorije" #. module: document_page #: view:document.page:0 msgid "Name" -msgstr "" +msgstr "Naziv" #. module: document_page #: field:document.page.create.menu,menu_parent_id:0 @@ -177,12 +179,12 @@ msgstr "Datum kreiranja" #: code:addons/document_page/wizard/document_page_show_diff.py:50 #, python-format msgid "You need to select minimum one or maximum two history revisions!" -msgstr "" +msgstr "Morate odabrati minimum jednu ili maksimum dvije revizije!" #. module: document_page #: model:ir.actions.act_window,name:document_page.action_history msgid "Page history" -msgstr "" +msgstr "Povijest stranica" #. module: document_page #: field:document.page.history,summary:0 @@ -192,17 +194,17 @@ msgstr "Sažetak" #. module: document_page #: view:document.page:0 msgid "e.g. Once upon a time..." -msgstr "" +msgstr "npr. Bilo jednom..." #. module: document_page #: model:ir.actions.act_window,help:document_page.action_page msgid "Create web pages" -msgstr "" +msgstr "Kreiraj web stranice" #. module: document_page #: view:document.page.history:0 msgid "Document History" -msgstr "" +msgstr "Povijest dokumenata" #. module: document_page #: field:document.page.create.menu,menu_name:0 @@ -212,12 +214,12 @@ msgstr "Naziv izbornika" #. module: document_page #: field:document.page.history,page_id:0 msgid "Page" -msgstr "" +msgstr "Stranica" #. module: document_page #: field:document.page,history_ids:0 msgid "History" -msgstr "" +msgstr "Povijest" #. module: document_page #: field:document.page,write_date:0 @@ -234,14 +236,14 @@ msgstr "Kreiraj izbornik" #. module: document_page #: field:document.page,display_content:0 msgid "Displayed Content" -msgstr "" +msgstr "Prikazani sadržaj" #. module: document_page #: code:addons/document_page/document_page.py:129 #: code:addons/document_page/wizard/document_page_show_diff.py:50 #, python-format msgid "Warning!" -msgstr "" +msgstr "Upozorenje!" #. module: document_page #: view:document.page.create.menu:0 @@ -257,9 +259,9 @@ msgstr "Razlika" #. module: document_page #: view:document.page:0 msgid "Document Type" -msgstr "" +msgstr "Vrsta dokumenta" #. module: document_page #: field:document.page,child_ids:0 msgid "Children" -msgstr "" +msgstr "Podređeni" diff --git a/addons/mrp/i18n/lv.po b/addons/mrp/i18n/lv.po index ca6fc7c6c5d..5c913831206 100644 --- a/addons/mrp/i18n/lv.po +++ b/addons/mrp/i18n/lv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:37+0000\n" -"PO-Revision-Date: 2013-03-07 14:41+0000\n" +"PO-Revision-Date: 2013-03-14 16:18+0000\n" "Last-Translator: Jānis \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:49+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: mrp #: help:mrp.config.settings,module_mrp_repair:0 @@ -180,7 +180,7 @@ msgstr "" #. module: mrp #: field:change.production.qty,product_qty:0 msgid "Product Qty" -msgstr "Prece skaits" +msgstr "Produkta daudzums" #. module: mrp #: view:mrp.production:0 @@ -617,7 +617,7 @@ msgstr "" #. module: mrp #: selection:mrp.production,state:0 msgid "Picking Exception" -msgstr "Kustības izņēmums" +msgstr "Izsniegšanas izņēmums" #. module: mrp #: field:mrp.bom,bom_lines:0 @@ -670,7 +670,7 @@ msgstr "Recepšu komponentes" #. module: mrp #: model:ir.model,name:mrp.model_stock_move msgid "Stock Move" -msgstr "Noliktavas kustība" +msgstr "Krājumu kustība" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_planning @@ -1489,7 +1489,7 @@ msgstr "Papildu informācija" #. module: mrp #: model:ir.model,name:mrp.model_change_production_qty msgid "Change Quantity of Products" -msgstr "Mainīt produktu skaitu" +msgstr "Mainīt produktu daudzumu" #. module: mrp #: model:process.node,note:mrp.process_node_productionorder0 @@ -1922,17 +1922,17 @@ msgstr "Sekotāji" msgid "" "If the active field is set to False, it will allow you to hide the bills of " "material without removing it." -msgstr "" +msgstr "Ja lauks nav aktivizēts, tas ļauj paslēpt receptes neizdzēšot tās." #. module: mrp #: field:mrp.bom,product_rounding:0 msgid "Product Rounding" -msgstr "" +msgstr "Produkta noapaļošana" #. module: mrp #: selection:mrp.production,state:0 msgid "New" -msgstr "" +msgstr "Jauns" #. module: mrp #: selection:mrp.product.produce,mode:0 @@ -1942,64 +1942,64 @@ msgstr "" #. module: mrp #: view:mrp.production:0 msgid "Recreate Picking" -msgstr "" +msgstr "Pārveidot kustību" #. module: mrp #: selection:mrp.bom,method:0 msgid "On Order" -msgstr "" +msgstr "Pēc ordera" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_configuration msgid "Configuration" -msgstr "" +msgstr "Iestatījumi" #. module: mrp #: view:mrp.bom:0 msgid "Starting Date" -msgstr "" +msgstr "Sākuma datums" #. module: mrp #: field:mrp.workcenter,time_stop:0 msgid "Time after prod." -msgstr "" +msgstr "Laiks pēc ražošanas" #. module: mrp #: field:mrp.workcenter.load,time_unit:0 msgid "Type of period" -msgstr "" +msgstr "Perioda tips" #. module: mrp #: view:mrp.production:0 msgid "Total Qty" -msgstr "" +msgstr "Daudzums kopā" #. module: mrp #: field:mrp.production.workcenter.line,hour:0 #: field:mrp.routing.workcenter,hour_nbr:0 #: field:report.workcenter.load,hour:0 msgid "Number of Hours" -msgstr "" +msgstr "Stundu skaits" #. module: mrp #: view:mrp.workcenter:0 msgid "Costing Information" -msgstr "" +msgstr "Izmaksu informācija" #. module: mrp #: model:process.node,name:mrp.process_node_purchaseprocure0 msgid "Procurement Orders" -msgstr "" +msgstr "Iepirkumu orderi" #. module: mrp #: help:mrp.bom,product_rounding:0 msgid "Rounding applied on the product quantity." -msgstr "" +msgstr "Noapaļošana pēc produkta daudzuma." #. module: mrp #: model:process.node,note:mrp.process_node_stock0 msgid "Assignment from Production or Purchase Order." -msgstr "" +msgstr "Piešķiršana no ražošanas vai iepirkumu orderiem." #. module: mrp #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action @@ -2023,17 +2023,17 @@ msgstr "" #. module: mrp #: field:mrp.routing.workcenter,routing_id:0 msgid "Parent Routing" -msgstr "" +msgstr "Primārā maršrutēšana" #. module: mrp #: help:mrp.workcenter,time_start:0 msgid "Time in hours for the setup." -msgstr "" +msgstr "Uzstādīšanas laiks stundās." #. module: mrp #: field:mrp.config.settings,module_mrp_repair:0 msgid "Manage repairs of products " -msgstr "" +msgstr "Pārvaldīt produktu remontus / labošanu " #. module: mrp #: help:mrp.config.settings,module_mrp_byproduct:0 @@ -2043,78 +2043,82 @@ msgid "" " With this module: A + B + C -> D + E.\n" " This installs the module mrp_byproduct." msgstr "" +"Jūs varat konfigurēt blakus produktus receptēs.\n" +" Bez šī moduļa: A + B + C -> D.\n" +" Ar šo moduli: A + B + C -> D + E.\n" +" Ar šo tiek uzinstalēts modulis mrp_byproduct." #. module: mrp #: field:procurement.order,bom_id:0 msgid "BoM" -msgstr "" +msgstr "Recepte" #. module: mrp #: model:ir.model,name:mrp.model_report_mrp_inout #: view:report.mrp.inout:0 msgid "Stock value variation" -msgstr "" +msgstr "Krājumu vērtības izmaiņas (svārstības)" #. module: mrp #: model:process.node,note:mrp.process_node_mts0 #: model:process.node,note:mrp.process_node_servicemts0 msgid "Assignment from stock." -msgstr "" +msgstr "Piešķiršana no noliktavas." #. module: mrp #: code:addons/mrp/report/price.py:139 #, python-format msgid "Cost Price per Unit of Measure" -msgstr "" +msgstr "Katras mērvienības pašizmaksas cena" #. module: mrp #: field:report.mrp.inout,date:0 #: view:report.workcenter.load:0 #: field:report.workcenter.load,name:0 msgid "Week" -msgstr "" +msgstr "Nedēļa" #. module: mrp #: selection:mrp.production,priority:0 msgid "Normal" -msgstr "" +msgstr "Standarta" #. module: mrp #: view:mrp.production:0 msgid "Production started late" -msgstr "" +msgstr "Ražošanu uzsāka novēloti" #. module: mrp #: model:process.node,note:mrp.process_node_routing0 msgid "Manufacturing Steps." -msgstr "" +msgstr "Ražošanas soļi." #. module: mrp #: code:addons/mrp/report/price.py:146 #: model:ir.actions.report.xml,name:mrp.report_cost_structure #, python-format msgid "Cost Structure" -msgstr "" +msgstr "Izmaksu struktūra" #. module: mrp #: model:res.groups,name:mrp.group_mrp_user msgid "User" -msgstr "" +msgstr "Lietotājs" #. module: mrp #: selection:mrp.product.produce,mode:0 msgid "Consume & Produce" -msgstr "" +msgstr "Patērēt & Ražot" #. module: mrp #: field:mrp.bom,bom_id:0 msgid "Parent BoM" -msgstr "" +msgstr "Primārā recepte" #. module: mrp #: report:bom.structure:0 msgid "BOM Ref" -msgstr "" +msgstr "Receptes atsauce" #. module: mrp #: code:addons/mrp/mrp.py:765 @@ -2127,22 +2131,22 @@ msgstr "" #. module: mrp #: model:process.node,note:mrp.process_node_stockproduct0 msgid "Product type is Stockable or Consumable." -msgstr "" +msgstr "Produkta tips ir krājums vai pašpatērējams." #. module: mrp #: selection:mrp.production,state:0 msgid "Production Started" -msgstr "" +msgstr "Ražošana uzsākta" #. module: mrp #: model:process.node,name:mrp.process_node_procureproducts0 msgid "Procure Products" -msgstr "" +msgstr "Produktu apgāde" #. module: mrp #: field:mrp.product.produce,product_qty:0 msgid "Select Quantity" -msgstr "" +msgstr "Norādīt daudzumu" #. module: mrp #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action @@ -2152,13 +2156,13 @@ msgstr "" #: view:product.product:0 #: field:product.product,bom_ids:0 msgid "Bill of Materials" -msgstr "" +msgstr "Receptes (BoM)" #. module: mrp #: code:addons/mrp/mrp.py:610 #, python-format msgid "Cannot find a bill of material for this product." -msgstr "" +msgstr "Nevar atrast šī produkta recepti." #. module: mrp #: view:product.product:0 @@ -2171,24 +2175,24 @@ msgstr "" #. module: mrp #: field:mrp.config.settings,module_stock_no_autopicking:0 msgid "Manage manual picking to fulfill manufacturing orders " -msgstr "" +msgstr "Pārvaldīt manuālo izsniegšanu lai izpildītu ražošanas orderus " #. module: mrp #: view:mrp.routing.workcenter:0 #: view:mrp.workcenter:0 msgid "General Information" -msgstr "" +msgstr "Pamatinformācija" #. module: mrp #: view:mrp.production:0 msgid "Productions" -msgstr "" +msgstr "Ražošanas" #. module: mrp #: model:ir.model,name:mrp.model_stock_move_split #: view:mrp.production:0 msgid "Split in Serial Numbers" -msgstr "" +msgstr "Sadalīt pēc sēriju numuriem" #. module: mrp #: help:mrp.bom,product_uos:0 @@ -2201,41 +2205,41 @@ msgstr "" #: view:mrp.production:0 #: field:stock.move,production_id:0 msgid "Production" -msgstr "" +msgstr "Ražošana" #. module: mrp #: model:ir.model,name:mrp.model_mrp_production_workcenter_line #: field:mrp.production.workcenter.line,name:0 msgid "Work Order" -msgstr "" +msgstr "Izpildes orderis" #. module: mrp #: view:board.board:0 msgid "Procurements in Exception" -msgstr "" +msgstr "Iepirkumu izņēmumi" #. module: mrp #: model:ir.model,name:mrp.model_mrp_product_price msgid "Product Price" -msgstr "" +msgstr "Produkta cena" #. module: mrp #: view:change.production.qty:0 msgid "Change Quantity" -msgstr "" +msgstr "Mainīt daudzumu" #. module: mrp #: view:change.production.qty:0 #: model:ir.actions.act_window,name:mrp.action_change_production_qty msgid "Change Product Qty" -msgstr "" +msgstr "Mainīt produkta daudzumu" #. module: mrp #: field:mrp.routing,note:0 #: field:mrp.routing.workcenter,note:0 #: field:mrp.workcenter,note:0 msgid "Description" -msgstr "" +msgstr "Apraksts" #. module: mrp #: view:board.board:0 @@ -2246,12 +2250,12 @@ msgstr "" #: code:addons/mrp/wizard/change_production_qty.py:68 #, python-format msgid "Active Id not found" -msgstr "" +msgstr "Aktīvs id nav atrasts" #. module: mrp #: model:process.node,note:mrp.process_node_procureproducts0 msgid "The way to procurement depends on the product type." -msgstr "" +msgstr "Iepirkuma veids atkarīgs no produkta tipa." #. module: mrp #: model:ir.actions.act_window,name:mrp.open_board_manufacturing @@ -2259,7 +2263,7 @@ msgstr "" #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing #: model:ir.ui.menu,name:mrp.next_id_77 msgid "Manufacturing" -msgstr "" +msgstr "Ražošana" #. module: mrp #: help:mrp.bom,type:0 @@ -2275,7 +2279,7 @@ msgstr "" #: model:ir.actions.act_window,name:mrp.action_mrp_configuration #: view:mrp.config.settings:0 msgid "Configure Manufacturing" -msgstr "" +msgstr "Konfigurēt ražošanu" #. module: mrp #: view:product.product:0 @@ -2283,6 +2287,8 @@ msgid "" "a manufacturing\n" " order" msgstr "" +"ražošanas\n" +" orderis" #. module: mrp #: field:mrp.config.settings,group_mrp_properties:0 @@ -2355,7 +2361,7 @@ msgstr "" #. module: mrp #: selection:mrp.bom,method:0 msgid "On Stock" -msgstr "" +msgstr "Krājumā" #. module: mrp #: field:mrp.bom,sequence:0 @@ -2363,12 +2369,12 @@ msgstr "" #: field:mrp.production.workcenter.line,sequence:0 #: field:mrp.routing.workcenter,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Sekvence" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp msgid "Resource Leaves" -msgstr "" +msgstr "Resursu kavējumi" #. module: mrp #: help:mrp.bom,sequence:0 @@ -2385,4 +2391,4 @@ msgstr "" #: field:mrp.production,move_lines:0 #: report:mrp.production.order:0 msgid "Products to Consume" -msgstr "" +msgstr "Izejvielas" diff --git a/addons/mrp_byproduct/i18n/lv.po b/addons/mrp_byproduct/i18n/lv.po new file mode 100644 index 00000000000..9ca970ac8b5 --- /dev/null +++ b/addons/mrp_byproduct/i18n/lv.po @@ -0,0 +1,106 @@ +# Latvian translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:38+0000\n" +"PO-Revision-Date: 2013-03-14 15:52+0000\n" +"Last-Translator: Jānis \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" + +#. module: mrp_byproduct +#: help:mrp.subproduct,subproduct_type:0 +msgid "" +"Define how the quantity of byproducts will be set on the production orders " +"using this BoM. 'Fixed' depicts a situation where the quantity of created " +"byproduct is always equal to the quantity set on the BoM, regardless of how " +"many are created in the production order. By opposition, 'Variable' means " +"that the quantity will be computed as '(quantity of byproduct set on the " +"BoM / quantity of manufactured product set on the BoM * quantity of " +"manufactured product in the production order.)'" +msgstr "" + +#. module: mrp_byproduct +#: field:mrp.subproduct,product_id:0 +msgid "Product" +msgstr "Produkts" + +#. module: mrp_byproduct +#: field:mrp.subproduct,product_uom:0 +msgid "Product Unit of Measure" +msgstr "Produkta mērvienība" + +#. module: mrp_byproduct +#: model:ir.model,name:mrp_byproduct.model_mrp_production +msgid "Manufacturing Order" +msgstr "Ražošanas orderis" + +#. module: mrp_byproduct +#: model:ir.model,name:mrp_byproduct.model_change_production_qty +msgid "Change Quantity of Products" +msgstr "Mainīt produktu daudzumu" + +#. module: mrp_byproduct +#: view:mrp.bom:0 +#: field:mrp.bom,sub_products:0 +msgid "Byproducts" +msgstr "Blakusprodukti" + +#. module: mrp_byproduct +#: field:mrp.subproduct,subproduct_type:0 +msgid "Quantity Type" +msgstr "Daudzuma tips" + +#. module: mrp_byproduct +#: model:ir.model,name:mrp_byproduct.model_mrp_bom +msgid "Bill of Material" +msgstr "Recepte" + +#. module: mrp_byproduct +#: field:mrp.subproduct,product_qty:0 +msgid "Product Qty" +msgstr "Produkta daudzums" + +#. module: mrp_byproduct +#: code:addons/mrp_byproduct/mrp_byproduct.py:63 +#, python-format +msgid "Warning" +msgstr "Uzmanību" + +#. module: mrp_byproduct +#: field:mrp.subproduct,bom_id:0 +msgid "BoM" +msgstr "Recepte" + +#. module: mrp_byproduct +#: selection:mrp.subproduct,subproduct_type:0 +msgid "Variable" +msgstr "Mainīgais" + +#. module: mrp_byproduct +#: selection:mrp.subproduct,subproduct_type:0 +msgid "Fixed" +msgstr "Fiksēts" + +#. module: mrp_byproduct +#: code:addons/mrp_byproduct/mrp_byproduct.py:63 +#, python-format +msgid "" +"The Product Unit of Measure you chose has a different category than in the " +"product form." +msgstr "" +"Izvēlētās produkta mērvienības kategorija ir citādāka, nekā produkta formā." + +#. module: mrp_byproduct +#: model:ir.model,name:mrp_byproduct.model_mrp_subproduct +msgid "Byproduct" +msgstr "Blakusprodukts" diff --git a/addons/mrp_operations/i18n/lv.po b/addons/mrp_operations/i18n/lv.po new file mode 100644 index 00000000000..119bc8d8f47 --- /dev/null +++ b/addons/mrp_operations/i18n/lv.po @@ -0,0 +1,785 @@ +# Latvian translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-03-07 08:38+0000\n" +"PO-Revision-Date: 2013-03-14 16:48+0000\n" +"Last-Translator: Jānis \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form +#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_order +#: view:mrp.production.workcenter.line:0 +#: view:mrp.workorder:0 +msgid "Work Orders" +msgstr "Izpildes orderi" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:484 +#, python-format +msgid "Operation is already finished!" +msgstr "Process jau ir pabeigts!" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_canceloperation0 +msgid "Cancel the operation." +msgstr "Atceļ procesu." + +#. module: mrp_operations +#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code +msgid "mrp_operations.operation.code" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: view:mrp.workorder:0 +msgid "Group By..." +msgstr "Grupēt pēc..." + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_workorder0 +msgid "Information from the routing definition." +msgstr "Informācija no maršrutēšanas definēšanas." + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,uom:0 +msgid "Unit of Measure" +msgstr "Mērvienība" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "March" +msgstr "Marts" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning +msgid "Work Centers" +msgstr "Resursi" + +#. module: mrp_operations +#: view:mrp.production:0 +#: view:mrp.production.workcenter.line:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Resume" +msgstr "Kopsavilkums" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Product to Produce" +msgstr "Ražojums izpildei" + +#. module: mrp_operations +#: view:mrp_operations.operation:0 +msgid "Production Operation" +msgstr "Ražošanas operācija" + +#. module: mrp_operations +#: view:mrp.production:0 +msgid "Set to Draft" +msgstr "Atzīmēt kā melnrakstu" + +#. module: mrp_operations +#: field:mrp.production,allow_reorder:0 +msgid "Free Serialisation" +msgstr "" + +#. module: mrp_operations +#: model:ir.model,name:mrp_operations.model_mrp_production +msgid "Manufacturing Order" +msgstr "Ražošanas orderis" + +#. module: mrp_operations +#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0 +msgid "Mrp Operations" +msgstr "Ražošanas operācijas" + +#. module: mrp_operations +#: view:mrp.workorder:0 +#: field:mrp.workorder,day:0 +msgid "Day" +msgstr "Diena" + +#. module: mrp_operations +#: view:mrp.production:0 +msgid "Cancel Order" +msgstr "Atcelt orderi" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_productionorder0 +msgid "Production Order" +msgstr "Ražošanas orderis" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "Picking Exception" +msgstr "Izsniegšanas izņēmums" + +#. module: mrp_operations +#: model:process.transition,name:mrp_operations.process_transition_productionstart0 +msgid "Creation of the work order" +msgstr "Izpildes ordera veidošana" + +#. module: mrp_operations +#: model:process.transition,note:mrp_operations.process_transition_productionstart0 +msgid "The work orders are created on the basis of the production order." +msgstr "Izpildes orderi ir izveidoti pamatojoties uz ražošanas orderi." + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:134 +#: code:addons/mrp_operations/mrp_operations.py:465 +#: code:addons/mrp_operations/mrp_operations.py:469 +#: code:addons/mrp_operations/mrp_operations.py:481 +#: code:addons/mrp_operations/mrp_operations.py:484 +#, python-format +msgid "Error!" +msgstr "Kļūda!" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,state:0 +#: selection:mrp.workorder,state:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Cancelled" +msgstr "Atcelts" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:477 +#, python-format +msgid "Operation is Already Cancelled!" +msgstr "Operācija jau ir atcelta!" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action +#: view:mrp.production.workcenter.line:0 +msgid "Operations" +msgstr "Operācijas" + +#. module: mrp_operations +#: model:ir.model,name:mrp_operations.model_stock_move +msgid "Stock Move" +msgstr "Krājumu kustība" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:481 +#, python-format +msgid "No operation to cancel." +msgstr "Nav operācija, ko atcelt." + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:474 +#, python-format +msgid "" +"In order to Finish the operation, it must be in the Start or Resume state!" +msgstr "Lai pabeigtu operāciju, tai jābūt statusā Sākums vai Atjaunot!" + +#. module: mrp_operations +#: field:mrp.workorder,nbr:0 +msgid "# of Lines" +msgstr "Rindu skaits" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: selection:mrp.production.workcenter.line,production_state:0 +#: selection:mrp.production.workcenter.line,state:0 +#: selection:mrp.workorder,state:0 +msgid "Draft" +msgstr "Melnraksts" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Actual Production Date" +msgstr "Aktuālais ražošanas datums" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Production Workcenter" +msgstr "Ražošanas resurss" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,date_finished:0 +#: field:mrp.production.workcenter.line,date_planned_end:0 +#: field:mrp_operations.operation,date_finished:0 +msgid "End Date" +msgstr "Beigu datums" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "In Production" +msgstr "Ražošanā" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder +#: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line +msgid "Work Order" +msgstr "Izpildes orderis" + +#. module: mrp_operations +#: model:process.transition,note:mrp_operations.process_transition_workstartoperation0 +msgid "" +"There is 1 work order per work center. The information about the number of " +"cycles or the cycle time." +msgstr "" + +#. module: mrp_operations +#: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree +msgid "Work Order Analysis" +msgstr "Izpildes ordera analīze" + +#. module: mrp_operations +#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action_planning +msgid "Work Orders By Resource" +msgstr "Izpildes orderi pēc resursa" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Planned Date" +msgstr "Plānotais datums" + +#. module: mrp_operations +#: view:mrp.workorder:0 +#: field:mrp.workorder,product_qty:0 +msgid "Product Qty" +msgstr "Produkta daudzums" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:134 +#, python-format +msgid "Manufacturing order cannot start in state \"%s\"!" +msgstr "Ražošanas orderis nevar tikt uzsākts statusā \"%s\"!" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "July" +msgstr "Jūlijs" + +#. module: mrp_operations +#: field:mrp_operations.operation.code,name:0 +msgid "Operation Name" +msgstr "Operācijas nosaukums" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: field:mrp.production.workcenter.line,state:0 +#: view:mrp.workorder:0 +#: field:mrp.workorder,state:0 +#: field:mrp_operations.operation.code,start_stop:0 +msgid "Status" +msgstr "Statuss" + +#. module: mrp_operations +#: view:mrp.workorder:0 +msgid "Planned Year" +msgstr "Plānotais gads" + +#. module: mrp_operations +#: field:mrp_operations.operation,order_date:0 +msgid "Order Date" +msgstr "Ordera datums" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action +msgid "Future Work Orders" +msgstr "Nākotnes izpildes orderi" + +#. module: mrp_operations +#: view:mrp.production:0 +msgid "Finish Order" +msgstr "Beigu orderis" + +#. module: mrp_operations +#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_form +msgid "" +"

        \n" +" Click to start a new work order. \n" +"

        \n" +" Work Orders is the list of operations to be performed for each\n" +" manufacturing order. Once you start the first work order of a\n" +" manufacturing order, the manufacturing order is automatically\n" +" marked as started. Once you finish the latest operation of a\n" +" manufacturing order, the MO is automatically done and the " +"related\n" +" products are produced.\n" +"

        \n" +" " +msgstr "" + +#. module: mrp_operations +#: help:mrp.production.workcenter.line,delay:0 +msgid "The elapsed time between operation start and stop in this Work Center" +msgstr "" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_canceloperation0 +msgid "Operation Cancelled" +msgstr "Operācija ir atcelta" + +#. module: mrp_operations +#: view:mrp.production:0 +msgid "Pause Work Order" +msgstr "Nopauzēt izpildes orderi" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "September" +msgstr "Septembris" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "December" +msgstr "Decembris" + +#. module: mrp_operations +#: view:mrp.workorder:0 +#: field:mrp.workorder,month:0 +msgid "Month" +msgstr "Mēnesis" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "Canceled" +msgstr "Atcelts" + +#. module: mrp_operations +#: model:ir.model,name:mrp_operations.model_mrp_operations_operation +msgid "mrp_operations.operation" +msgstr "" + +#. module: mrp_operations +#: model:ir.model,name:mrp_operations.model_mrp_workorder +msgid "Work Order Report" +msgstr "Izpildes ordera atskaite" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,date_start:0 +#: field:mrp_operations.operation,date_start:0 +msgid "Start Date" +msgstr "Sākuma datums" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "Waiting Goods" +msgstr "Gaida preces" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,production_state:0 +msgid "Production Status" +msgstr "Ražošanas statuss" + +#. module: mrp_operations +#: selection:mrp.workorder,state:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Pause" +msgstr "Pauze" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: selection:mrp.production.workcenter.line,state:0 +#: selection:mrp.workorder,state:0 +msgid "In Progress" +msgstr "Tiek izpildīts" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:465 +#, python-format +msgid "" +"In order to Pause the operation, it must be in the Start or Resume state!" +msgstr "" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:469 +#, python-format +msgid "In order to Resume the operation, it must be in the Pause state!" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production:0 +#: view:mrp.production.workcenter.line:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Start" +msgstr "Sākt" + +#. module: mrp_operations +#: view:mrp_operations.operation:0 +msgid "Calendar View" +msgstr "Kalendāra skatījums" + +#. module: mrp_operations +#: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0 +msgid "" +"When the operation needs to be cancelled, you can do it in the work order " +"form." +msgstr "" + +#. module: mrp_operations +#: view:mrp.production:0 +#: view:mrp.production.workcenter.line:0 +msgid "Set Draft" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production:0 +#: view:mrp.production.workcenter.line:0 +#: selection:mrp.production.workcenter.line,state:0 +msgid "Pending" +msgstr "" + +#. module: mrp_operations +#: view:mrp_operations.operation.code:0 +msgid "Production Operation Code" +msgstr "" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:461 +#, python-format +msgid "" +"Operation has already started! You can either Pause/Finish/Cancel the " +"operation." +msgstr "" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "August" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +msgid "Started" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Production started late" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +msgid "Planned Day" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "June" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +#: field:mrp.workorder,total_cycles:0 +msgid "Total Cycles" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +msgid "Ready to Produce" +msgstr "" + +#. module: mrp_operations +#: field:stock.move,move_dest_id_lines:0 +msgid "Children Moves" +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning +msgid "Work Orders Planning" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: field:mrp.workorder,date:0 +msgid "Date" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "November" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +msgid "Search" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "October" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "January" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production:0 +msgid "Resume Work Order" +msgstr "" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_doneoperation0 +msgid "Finish the operation." +msgstr "" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:454 +#, python-format +msgid "Operation is not started yet !" +msgstr "" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_productionorder0 +msgid "Information from the production order." +msgstr "" + +#. module: mrp_operations +#: code:addons/mrp_operations/mrp_operations.py:454 +#: code:addons/mrp_operations/mrp_operations.py:461 +#: code:addons/mrp_operations/mrp_operations.py:474 +#: code:addons/mrp_operations/mrp_operations.py:477 +#, python-format +msgid "Sorry!" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +msgid "Current" +msgstr "" + +#. module: mrp_operations +#: field:mrp_operations.operation,code_id:0 +#: field:mrp_operations.operation.code,code:0 +msgid "Code" +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action +msgid "Confirmed Work Orders" +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action +msgid "Operation Codes" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,qty:0 +msgid "Qty" +msgstr "" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_doneoperation0 +msgid "Operation Done" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.production.workcenter.line,production_state:0 +#: view:mrp.workorder:0 +#: selection:mrp_operations.operation.code,start_stop:0 +msgid "Done" +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode +msgid "Start/Stop Barcode" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Cancel" +msgstr "" + +#. module: mrp_operations +#: help:mrp.production.workcenter.line,state:0 +msgid "" +"* When a work order is created it is set in 'Draft' status.\n" +"* When user sets work order in start mode that time it will be set in 'In " +"Progress' status.\n" +"* When work order is in running mode, during that time if user wants to stop " +"or to make changes in order then can set in 'Pending' status.\n" +"* When the user cancels the work order it will be set in 'Canceled' status.\n" +"* When order is completely processed that time it is set in 'Finished' " +"status." +msgstr "" + +#. module: mrp_operations +#: model:process.node,name:mrp_operations.process_node_startoperation0 +msgid "Start Operation" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Information" +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning +msgid "" +"

        \n" +" Click to start a new work order.\n" +"

        \n" +" To manufacture or assemble products, and use raw materials and\n" +" finished products you must also handle manufacturing " +"operations.\n" +" Manufacturing operations are often called Work Orders. The " +"various\n" +" operations will have different impacts on the costs of\n" +" manufacturing and planning depending on the available workload.\n" +"

        \n" +" " +msgstr "" + +#. module: mrp_operations +#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode +msgid "Work Centers Barcode" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Late" +msgstr "" + +#. module: mrp_operations +#: field:mrp.workorder,delay:0 +msgid "Delay" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: view:mrp.workorder:0 +#: field:mrp.workorder,production_id:0 +#: field:mrp_operations.operation,production_id:0 +msgid "Production" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Search Work Orders" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +#: view:mrp.workorder:0 +#: field:mrp.workorder,workcenter_id:0 +#: field:mrp_operations.operation,workcenter_id:0 +#: model:process.node,name:mrp_operations.process_node_workorder0 +msgid "Work Center" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,date_planned:0 +msgid "Scheduled Date" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,product:0 +#: view:mrp.workorder:0 +#: field:mrp.workorder,product_id:0 +msgid "Product" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +#: field:mrp.workorder,total_hours:0 +msgid "Total Hours" +msgstr "" + +#. module: mrp_operations +#: help:mrp.production,allow_reorder:0 +msgid "" +"Check this to be able to move independently all production orders, without " +"moving dependent ones." +msgstr "" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "May" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production:0 +#: view:mrp.production.workcenter.line:0 +#: selection:mrp.production.workcenter.line,state:0 +#: selection:mrp.workorder,state:0 +msgid "Finished" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Hours by Work Center" +msgstr "" + +#. module: mrp_operations +#: field:mrp.production.workcenter.line,delay:0 +msgid "Working Hours" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +msgid "Planned Month" +msgstr "" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "February" +msgstr "" + +#. module: mrp_operations +#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0 +msgid "Operation cancelled" +msgstr "" + +#. module: mrp_operations +#: model:process.node,note:mrp_operations.process_node_startoperation0 +msgid "Start the operation." +msgstr "" + +#. module: mrp_operations +#: selection:mrp.workorder,month:0 +msgid "April" +msgstr "" + +#. module: mrp_operations +#: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0 +msgid "Operation done" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +msgid "#Line Orders" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production:0 +msgid "Start Working" +msgstr "" + +#. module: mrp_operations +#: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0 +msgid "" +"When the operation is finished, the operator updates the system by finishing " +"the work order." +msgstr "" + +#. module: mrp_operations +#: model:process.transition,name:mrp_operations.process_transition_workstartoperation0 +msgid "Details of the work order" +msgstr "" + +#. module: mrp_operations +#: view:mrp.workorder:0 +#: field:mrp.workorder,year:0 +msgid "Year" +msgstr "" + +#. module: mrp_operations +#: view:mrp.production.workcenter.line:0 +msgid "Duration" +msgstr "" diff --git a/addons/portal/i18n/tr.po b/addons/portal/i18n/tr.po index 774c953a206..c971e951281 100644 --- a/addons/portal/i18n/tr.po +++ b/addons/portal/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2013-03-10 14:59+0000\n" +"PO-Revision-Date: 2013-03-14 20:37+0000\n" "Last-Translator: Ayhan KIZILTAN \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-11 05:42+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: portal #: view:portal.payment.acquirer:0 @@ -168,7 +168,7 @@ msgstr "veya" #: model:ir.actions.client,name:portal.action_mail_star_feeds_portal #: model:ir.ui.menu,name:portal.portal_mail_starfeeds msgid "To-do" -msgstr "" +msgstr "Yapılacaklar" #. module: portal #: code:addons/portal/wizard/portal_wizard.py:194 @@ -247,6 +247,14 @@ msgid "" "

        \n" " " msgstr "" +"

        \n" +" Hiçbir mesaj bulunamadı ve henüz hiç mesaj " +"gönderilmedi.\n" +"

        \n" +" Mesaj yazmak için üst-sağ simgeye tıklayın. Bu\n" +" mesaj, eğer bir iç kişiyse, epostayla gönderilecektir.\n" +"

        \n" +" " #. module: portal #: model:ir.ui.menu,name:portal.portal_menu @@ -598,6 +606,15 @@ msgid "" "

        \n" " " msgstr "" +"

        \n" +" Yapılacak bir şey yok.\n" +"

        \n" +" Geln kutunuzdaki mesajları işlerken, bazılarını " +"yapılacaklar\n" +" olarak işaretleyebilirsiniz. Bu menüden, bütün " +"yapılacaklarınızı işleyebilirsiniz.\n" +"

        \n" +" " #. module: portal #: view:portal.payment.acquirer:0 diff --git a/addons/portal_crm/i18n/hu.po b/addons/portal_crm/i18n/hu.po index 270fd0f7fc6..811dba047f7 100644 --- a/addons/portal_crm/i18n/hu.po +++ b/addons/portal_crm/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:38+0000\n" -"PO-Revision-Date: 2013-03-10 20:30+0000\n" +"PO-Revision-Date: 2013-03-14 08:04+0000\n" "Last-Translator: krnkris \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-11 05:42+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: portal_crm #: selection:portal_crm.crm_contact_us,type:0 @@ -365,7 +365,7 @@ msgstr "Tervezett költségek" #. module: portal_crm #: help:portal_crm.crm_contact_us,date_deadline:0 msgid "Estimate of the date on which the opportunity will be won." -msgstr "Körülbelüli dátum amikor a lehetőség el lessz nyerve." +msgstr "A lehetőség elnyerésének körülbelüli időpontja/dátuma." #. module: portal_crm #: help:portal_crm.crm_contact_us,email_cc:0 From dcc9a3aeabd304bd145c1d9156b06ba914a251d7 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Sun, 17 Mar 2013 05:30:35 +0000 Subject: [PATCH 89/89] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20130317052921-m3gthz6l7fx1jwu7 bzr revid: launchpad_translations_on_behalf_of_openerp-20130315064417-68iimts1xgj8bn5z bzr revid: launchpad_translations_on_behalf_of_openerp-20130317053035-kqb70nwvcg1iqldu --- addons/web/i18n/fr.po | 10 +++---- addons/web/i18n/pt_BR.po | 14 +++++----- addons/web_calendar/i18n/pt_BR.po | 13 +++++---- addons/web_kanban/i18n/fr.po | 10 ++++--- addons/web_kanban/i18n/pt_BR.po | 8 +++--- openerp/addons/base/i18n/nl.po | 10 +++---- openerp/addons/base/i18n/pt_BR.po | 46 ++++++++++++++++--------------- 7 files changed, 58 insertions(+), 53 deletions(-) diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po index 9b57748c888..f0806d3659a 100644 --- a/addons/web/i18n/fr.po +++ b/addons/web/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:39+0000\n" -"PO-Revision-Date: 2013-01-09 15:30+0000\n" -"Last-Translator: Numérigraphe \n" +"PO-Revision-Date: 2013-03-14 16:14+0000\n" +"Last-Translator: Quentin THEURET \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 06:06+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: web #. openerp-web @@ -1428,7 +1428,7 @@ msgstr "99+" #: code:addons/web/static/src/xml/base.xml:408 #, python-format msgid "Help" -msgstr "" +msgstr "Aide" #. module: web #. openerp-web diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po index c06f0443ae6..b437eb5fb46 100644 --- a/addons/web/i18n/pt_BR.po +++ b/addons/web/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:39+0000\n" -"PO-Revision-Date: 2013-02-26 09:39+0000\n" -"Last-Translator: Rui Andrada \n" +"PO-Revision-Date: 2013-03-16 14:21+0000\n" +"Last-Translator: Felippe Duarte \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 06:07+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-17 05:30+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: web #. openerp-web @@ -1422,7 +1422,7 @@ msgstr "99+" #: code:addons/web/static/src/xml/base.xml:408 #, python-format msgid "Help" -msgstr "" +msgstr "Ajuda" #. module: web #. openerp-web @@ -1935,7 +1935,7 @@ msgstr "-- Filtros --" #: code:addons/web/static/src/js/search.js:2157 #, python-format msgid "%(field)s %(operator)s" -msgstr "" +msgstr "%(field)s %(operator)s" #. module: web #. openerp-web @@ -2466,7 +2466,7 @@ msgstr "Editar Ação" #, python-format msgid "" "This filter is global and will be removed for everybody if you continue." -msgstr "" +msgstr "Este filtro é global e será removido para todos se você continuar." #. module: web #. openerp-web diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po index d15711eaa22..6a4b7bd9ccf 100644 --- a/addons/web_calendar/i18n/pt_BR.po +++ b/addons/web_calendar/i18n/pt_BR.po @@ -8,14 +8,15 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:39+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: Cristiano Korndörfer \n" +"PO-Revision-Date: 2013-03-16 14:21+0000\n" +"Last-Translator: Fábio Martinelli - http://zupy.com.br " +"\n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 06:07+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-17 05:30+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: web_calendar #. openerp-web @@ -36,7 +37,7 @@ msgstr "Detalhes" #: code:addons/web_calendar/static/src/js/calendar.js:487 #, python-format msgid "Edit: %s" -msgstr "" +msgstr "Editar: %s" #. module: web_calendar #. openerp-web @@ -160,7 +161,7 @@ msgstr "Agenda" #: code:addons/web_calendar/static/src/js/calendar.js:450 #, python-format msgid "Create: %s" -msgstr "" +msgstr "Criar: %s" #. module: web_calendar #. openerp-web diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po index 3bd90940b1b..24040d53341 100644 --- a/addons/web_kanban/i18n/fr.po +++ b/addons/web_kanban/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:39+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: Numérigraphe \n" +"PO-Revision-Date: 2013-03-14 16:16+0000\n" +"Last-Translator: Marc Cassuto \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 06:07+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-15 06:44+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: web_kanban #. openerp-web @@ -136,6 +136,8 @@ msgstr "restant)" #, python-format msgid "An error has occured while moving the record to this group: " msgstr "" +"Une erreur est survenue lors du déplacement de cet enregistrement dans ce " +"groupe : " #. module: web_kanban #. openerp-web diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po index f2dc0a4ce15..56a087a9140 100644 --- a/addons/web_kanban/i18n/pt_BR.po +++ b/addons/web_kanban/i18n/pt_BR.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:39+0000\n" -"PO-Revision-Date: 2013-01-26 06:23+0000\n" +"PO-Revision-Date: 2013-03-16 14:24+0000\n" "Last-Translator: Fábio Martinelli - http://zupy.com.br " "\n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 06:07+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-17 05:30+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: web_kanban #. openerp-web @@ -136,7 +136,7 @@ msgstr "restantes)" #: code:addons/web_kanban/static/src/js/kanban.js:421 #, python-format msgid "An error has occured while moving the record to this group: " -msgstr "" +msgstr "Ocorreu um erro ao mover este registro para este grupo: " #. module: web_kanban #. openerp-web diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index 3ce8a8a214b..b232f90ce2f 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:36+0000\n" -"PO-Revision-Date: 2013-03-10 09:36+0000\n" +"PO-Revision-Date: 2013-03-16 17:51+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-11 05:41+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-17 05:29+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -4237,7 +4237,7 @@ msgstr "Nauru" #: code:addons/base/res/res_company.py:166 #, python-format msgid "Reg" -msgstr "Reg" +msgstr "KvK Nr." #. module: base #: model:ir.model,name:base.model_ir_property @@ -15095,7 +15095,7 @@ msgstr "Toegang" #: field:res.partner,vat:0 #, python-format msgid "TIN" -msgstr "TIN" +msgstr "BTW Nr." #. module: base #: model:res.country,name:base.aw diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po index de2b693796c..a0ec755b087 100644 --- a/openerp/addons/base/i18n/pt_BR.po +++ b/openerp/addons/base/i18n/pt_BR.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-03-07 08:36+0000\n" -"PO-Revision-Date: 2013-01-26 20:25+0000\n" +"PO-Revision-Date: 2013-03-16 14:35+0000\n" "Last-Translator: Fábio Martinelli - http://zupy.com.br " "\n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-03-08 05:22+0000\n" -"X-Generator: Launchpad (build 16523)\n" +"X-Launchpad-Export-Date: 2013-03-17 05:29+0000\n" +"X-Generator: Launchpad (build 16532)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -34,7 +34,7 @@ msgstr "" #. module: base #: view:res.partner.bank:0 msgid "e.g. GEBABEBB" -msgstr "" +msgstr "ex. GEBABEBB" #. module: base #: model:res.country,name:base.sh @@ -772,7 +772,7 @@ msgstr "Compras e Vendas" #. module: base #: view:res.partner:0 msgid "Put an internal note..." -msgstr "" +msgstr "Deixe uma nota interna..." #. module: base #: view:ir.translation:0 @@ -1183,7 +1183,7 @@ msgstr "Atualizar Módulos" #: view:res.partner.bank:0 #: view:res.users:0 msgid "ZIP" -msgstr "" +msgstr "CEP" #. module: base #: selection:base.language.install,lang:0 @@ -3912,7 +3912,7 @@ msgstr "" #. module: base #: view:res.company:0 msgid "e.g. Global Business Solutions" -msgstr "" +msgstr "ex. Souções de Negócios Globais" #. module: base #: field:res.company,rml_header1:0 @@ -7478,7 +7478,7 @@ msgstr "USA Minor Outlying Islands" #. module: base #: view:base.language.import:0 msgid "e.g. English" -msgstr "" +msgstr "ex. Português" #. module: base #: help:ir.cron,numbercall:0 @@ -7572,7 +7572,7 @@ msgstr "É uma Empresa" #: view:res.partner:0 #: view:res.users:0 msgid "e.g. www.openerp.com" -msgstr "" +msgstr "ex. www.empresa.com.br" #. module: base #: selection:ir.cron,interval_type:0 @@ -8177,7 +8177,7 @@ msgstr "ir.cron" #. module: base #: model:ir.ui.menu,name:base.menu_sales_followup msgid "Payment Follow-up" -msgstr "" +msgstr "Acompanhamento de Cobranças" #. module: base #: model:res.country,name:base.cw @@ -9114,7 +9114,7 @@ msgstr "Login de Usuário" #. module: base #: view:ir.filters:0 msgid "Filters created by myself" -msgstr "" +msgstr "Filtros criados por mim" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_hn @@ -9373,7 +9373,7 @@ msgstr "Próximo número para esta sequência" #: view:res.partner:0 #: view:res.users:0 msgid "Tags..." -msgstr "" +msgstr "Tags..." #. module: base #: view:res.partner:0 @@ -9403,7 +9403,7 @@ msgstr "Formato do arquivo" #. module: base #: view:ir.filters:0 msgid "My filters" -msgstr "" +msgstr "Meus filtros" #. module: base #: field:res.lang,iso_code:0 @@ -10272,7 +10272,7 @@ msgstr "Gestão de Acompanhamento de Pagamentos" #: code:addons/orm.py:5334 #, python-format msgid "The value for the field '%s' already exists." -msgstr "" +msgstr "Já existe um valor para o campo '%s'" #. module: base #: field:workflow.workitem,inst_id:0 @@ -11595,7 +11595,7 @@ msgstr "Cód. do Parceiro" #: code:addons/base/static/src/js/apps.js:103 #, python-format msgid "OpenERP Apps Unreachable" -msgstr "" +msgstr "Apps OpenERP inalcansável" #. module: base #: field:ir.attachment,create_date:0 @@ -12217,6 +12217,8 @@ msgid "" "The `%s` module appears to be unavailable at the moment, please try again " "later." msgstr "" +"O módulo `%s` parece estar indisponível no momento, tente novamente mais " +"tarde" #. module: base #: view:ir.attachment:0 @@ -12637,7 +12639,7 @@ msgstr "" #: view:res.partner:0 #: view:res.users:0 msgid "Street..." -msgstr "" +msgstr "Endereço..." #. module: base #: constraint:res.users:0 @@ -14186,7 +14188,7 @@ msgstr "Cliente" #: view:res.partner:0 #: view:res.users:0 msgid "e.g. +32.81.81.37.00" -msgstr "" +msgstr "ex. (11) 1234-9999" #. module: base #: selection:base.language.install,lang:0 @@ -15315,7 +15317,7 @@ msgstr "Identificadores externos" #: code:addons/base/static/src/js/apps.js:103 #, python-format msgid "Showing locally available modules" -msgstr "" +msgstr "Mostrando módulos locais disponíveis" #. module: base #: selection:base.language.install,lang:0 @@ -17562,7 +17564,7 @@ msgstr "Auto-carregar Visão" #. module: base #: view:res.country:0 msgid "Address format..." -msgstr "" +msgstr "Formato do endereço..." #. module: base #: model:ir.module.module,description:base.module_l10n_et @@ -18151,7 +18153,7 @@ msgstr "Parâmetros" #. module: base #: view:res.partner:0 msgid "e.g. Sales Director" -msgstr "" +msgstr "ex. Diretor Comercial" #. module: base #: selection:base.language.install,lang:0 @@ -18346,7 +18348,7 @@ msgstr "Instalação Automática" #. module: base #: view:base.language.import:0 msgid "e.g. en_US" -msgstr "" +msgstr "ex. pt_BR" #. module: base #: model:ir.module.module,description:base.module_l10n_hn @@ -18588,7 +18590,7 @@ msgstr "Condição" #: code:addons/base/module/module.py:669 #, python-format msgid "Module not found" -msgstr "" +msgstr "Módulo não encontrado" #. module: base #: help:res.currency,rate:0