diff --git a/addons/account/account_financial_report.py b/addons/account/account_financial_report.py
index 28b5e08dc99..1d9a4a794eb 100644
--- a/addons/account/account_financial_report.py
+++ b/addons/account/account_financial_report.py
@@ -39,6 +39,8 @@ class account_financial_report(osv.osv):
_description = "Account Report"
def _get_level(self, cr, uid, ids, field_name, arg, context=None):
+ '''Returns a dictionary with key=the ID of a record and value = the level of this
+ record in the tree structure.'''
res = {}
for report in self.browse(cr, uid, ids, context=context):
level = 0
@@ -48,6 +50,8 @@ class account_financial_report(osv.osv):
return res
def _get_children_by_order(self, cr, uid, ids, context=None):
+ '''returns a dictionary with the key= the ID of a record and value = all its children,
+ computed recursively, and sorted by sequence. Ready for the printing'''
res = []
for id in ids:
res.append(id)
@@ -56,6 +60,12 @@ class account_financial_report(osv.osv):
return res
def _get_balance(self, cr, uid, ids, field_names, args, context=None):
+ '''returns a dictionary with key=the ID of a record and value=the balance amount
+ computed for this record. If the record is of type :
+ 'accounts' : it's the sum of the linked accounts
+ 'account_type' : it's the sum of leaf accoutns with such an account_type
+ 'account_report' : it's the amount of the related report
+ 'sum' : it's the sum of the children of this record (aka a 'view' record)'''
account_obj = self.pool.get('account.account')
res = {}
for report in self.browse(cr, uid, ids, context=context):
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index e1e0fccd253..4fabfc0532a 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1396,7 +1396,12 @@ class account_invoice_line(osv.osv):
# XXX this gets the default account for the user's company,
# it should get the default account for the invoice's company
# however, the invoice's company does not reach this point
- prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
+ if context is None:
+ context = {}
+ if context.get('type') in ('out_invoice','out_refund'):
+ prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
+ else:
+ prop = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category', context=context)
return prop and prop.id or False
_defaults = {
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 72d30c11cfd..53c604161ea 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -151,12 +151,12 @@ class account_config_settings(osv.osv_memory):
self.write(cr, uid, [id], vals, context)
return id
- def onchange_company_id(self, cr, uid, ids, company_id):
+ def onchange_company_id(self, cr, uid, ids, company_id, context=None):
# update related fields
values = {}
values['currency_id'] = False
if company_id:
- company = self.pool.get('res.company').browse(cr, uid, company_id)
+ company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
[('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 4bfd3697d89..7977c0fc505 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -33,7 +33,7 @@
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index b7330352b12..b335063b758 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -331,6 +331,9 @@ class account_asset_asset(osv.osv):
depreciation_obj = self.pool.get('account.asset.depreciation.line')
period = period_obj.browse(cr, uid, period_id, context=context)
depreciation_ids = depreciation_obj.search(cr, uid, [('asset_id', 'in', ids), ('depreciation_date', '<=', period.date_stop), ('depreciation_date', '>=', period.date_start), ('move_check', '=', False)], context=context)
+ if context is None:
+ context = {}
+ context.update({'depreciation_date':period.date_stop})
return depreciation_obj.create_move(cr, uid, depreciation_ids, context=context)
def create(self, cr, uid, vals, context=None):
@@ -388,7 +391,7 @@ class account_asset_depreciation_line(osv.osv):
created_move_ids = []
asset_ids = []
for line in self.browse(cr, uid, ids, context=context):
- depreciation_date = time.strftime('%Y-%m-%d')
+ depreciation_date = context.get('depreciation_date') or time.strftime('%Y-%m-%d')
period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
company_currency = line.asset_id.company_id.currency_id.id
current_currency = line.asset_id.currency_id.id
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 285a3529ee7..aeee35c93dc 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -238,7 +238,12 @@ class res_partner(osv.osv):
from report import account_followup_print
assert len(ids) == 1
+ if context is None:
+ context = {}
partner = self.browse(cr, uid, ids[0], context=context)
+ #copy the context to not change global context. Overwrite it because _() looks for the lang in local variable 'context'.
+ #Set the language to use = the partner language
+ context = dict(context, lang=partner.lang)
followup_table = ''
if partner.unreconciled_aml_ids:
company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
@@ -251,13 +256,14 @@ class res_partner(osv.osv):
followup_table += '''
- ''' % (currency.symbol)
+ '''
total = 0
for aml in currency_dict['line']:
block = aml['blocked'] and 'X' or ' '
@@ -268,13 +274,28 @@ class res_partner(osv.osv):
if date <= current_date and aml['balance'] > 0:
strbegin = "
"
total = rml_parse.formatLang(total, dp='Account', currency_obj=currency)
followup_table += '''
-
Amount due: %s
''' % (total)
+
''' + _("Amount due") + ''' : %s
''' % (total)
return followup_table
+ def write(self, cr, uid, ids, vals, context=None):
+ if vals.get("payment_responsible_id", False):
+ for part in self.browse(cr, uid, ids, context=context):
+ if part.payment_responsible_id <> vals["payment_responsible_id"]:
+ #Find partner_id of user put as responsible
+ responsible_partner_id = self.pool.get("res.users").browse(cr, uid, vals['payment_responsible_id'], context=context).partner_id.id
+ self.pool.get("mail.thread").message_post(cr, uid, 0,
+ body = _("You became responsible to do the next action for the payment follow-up of") + " " + part.name + " ",
+ type = 'comment',
+ subtype = "mail.mt_comment", context = context,
+ model = 'res.partner', res_id = part.id,
+ notified_partner_ids = [(6, 0, [responsible_partner_id])],
+ partner_ids = [(6, 0, [responsible_partner_id])])
+ return super(res_partner, self).write(cr, uid, ids, vals, context=context)
+
def action_done(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {'payment_next_action_date': False, 'payment_next_action':'', 'payment_responsible_id': False}, context=context)
@@ -408,13 +429,16 @@ class res_partner(osv.osv):
_inherit = "res.partner"
_columns = {
'payment_responsible_id':fields.many2one('res.users', ondelete='set null', string='Follow-up Responsible',
- help="Optionally you can assign a user to this field, which will make him responsible for the action."),
- 'payment_note':fields.text('Customer Payment Promise', help="Payment Note"),
+ help="Optionally you can assign a user to this field, which will make him responsible for the action.",
+ track_visibility="onchange"),
+ 'payment_note':fields.text('Customer Payment Promise', help="Payment Note", track_visibility="onchange"),
'payment_next_action':fields.text('Next Action',
- help="This is the next action to be taken. It will automatically be set when the partner gets a follow-up level that requires a manual action. "),
+ help="This is the next action to be taken. It will automatically be set when the partner gets a follow-up level that requires a manual action. ",
+ track_visibility="onchange"),
'payment_next_action_date':fields.date('Next Action Date',
help="This is when the manual follow-up is needed. " \
- "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. Can be practical to set manually e.g. to see if he keeps his promises."),
+ "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. "\
+ "Can be practical to set manually e.g. to see if he keeps his promises."),
'unreconciled_aml_ids':fields.one2many('account.move.line', 'partner_id', domain=['&', ('reconcile_id', '=', False), '&',
('account_id.active','=', True), '&', ('account_id.type', '=', 'receivable'), ('state', '!=', 'draft')]),
'latest_followup_date':fields.function(_get_latest, method=True, type='date', string="Latest Follow-up Date",
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index 8a27730b003..691d1555e8d 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -35,10 +35,10 @@
-
+
-
+
@@ -132,6 +132,18 @@
-
+
+ My Follow-Ups
+
+ res.partner
+ form
+ tree,form
+ [('payment_amount_due', '>', 0.0)]
+ {'Followupfirst':True, 'search_default_todo': True, 'search_default_my': True}
+
+
+
+
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index e93b4dd8b69..76aee365e00 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -26,6 +26,8 @@ from openerp import tools
from openerp.osv import fields, osv
from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
+
class account_followup_stat_by_partner(osv.osv):
_name = "account_followup.stat.by.partner"
_description = "Follow-up Statistics by Partner"
@@ -127,7 +129,7 @@ class account_followup_print(osv.osv_memory):
'email_body': fields.text('Email Body'),
'summary': fields.text('Summary', readonly=True),
'test_print': fields.boolean('Test Print',
- help='Check if you want to print follow-ups without changing follow-ups level.'),
+ help='Check if you want to print follow-ups without changing follow-up level.'),
}
def _get_followup(self, cr, uid, context=None):
@@ -204,7 +206,7 @@ class account_followup_print(osv.osv_memory):
if not part.unreconciled_aml_ids:
partners_to_clear.append(part.id)
self.pool.get('res.partner').action_done(cr, uid, partners_to_clear, context=context)
- return len(ids)
+ return len(partners_to_clear)
def do_process(self, cr, uid, ids, context=None):
if context is None:
@@ -313,6 +315,13 @@ class account_followup_print(osv.osv_memory):
if stat_line_id not in partner_list:
partner_list.append(stat_line_id)
to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': stat_line_id}
+ #Remove partners that are other companies in OpenERP
+ comp_obj = self.pool.get("res.company")
+ comp_ids = comp_obj.search(cr, SUPERUSER_ID, [], context=context)
+ for comp in comp_obj.browse(cr, SUPERUSER_ID, comp_ids, context=context):
+ company_partner_wiz_id = comp.partner_id.id * 10000 + company_id
+ if company_partner_wiz_id in partner_list:
+ partner_list.remove(company_partner_wiz_id)
return {'partner_ids': partner_list, 'to_update': to_update}
account_followup_print()
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 45edba33d34..c6f754ed18f 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -49,13 +49,25 @@ class account_config_settings(osv.osv_memory):
'company_id', 'income_currency_exchange_account_id',
type='many2one',
relation='account.account',
- string="Gain Exchange Rate Account"),
+ string="Gain Exchange Rate Account",
+ domain="[('type', '=', 'other')]"),
'expense_currency_exchange_account_id': fields.related(
'company_id', 'expense_currency_exchange_account_id',
type="many2one",
relation='account.account',
- string="Loss Exchange Rate Account"),
+ string="Loss Exchange Rate Account",
+ domain="[('type', '=', 'other')]"),
}
+ def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+ res = super(account_config_settings, self).onchange_company_id(cr, uid, ids, company_id, context=context)
+ if company_id:
+ company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+ res['value'].update({'income_currency_exchange_account_id': company.income_currency_exchange_account_id and company.income_currency_exchange_account_id.id or False,
+ 'expense_currency_exchange_account_id': company.expense_currency_exchange_account_id and company.expense_currency_exchange_account_id.id or False})
+ else:
+ res['value'].update({'income_currency_exchange_account_id': False,
+ 'expense_currency_exchange_account_id': False})
+ return res
class account_voucher(osv.osv):
def _check_paid(self, cr, uid, ids, name, args, context=None):
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5a204d605d6..b869f6c83b2 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -307,8 +307,9 @@
+
-
+ , 2011.
+# FIRST AUTHOR , 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-07 08:15+0000\n"
-"Last-Translator: Denis Karataev \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-13 09:46+0000\n"
+"Last-Translator: FULL NAME \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2013-02-14 04:37+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
-#. module: base_crypt
-#: model:ir.model,name:base_crypt.model_res_users
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Зашифрованный пароль"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
msgid "Users"
msgstr "Пользователи"
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#, python-format
-#~ msgid "Please specify the password !"
-#~ msgstr "Необходимо указать пароль!"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "Выбранная организация отсутствует в списке разрешённых для этого пользователя"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Не может быть двух пользователей с одинаковым именем пользователя!"
-
-#~ msgid "Base - Password Encryption"
-#~ msgstr "Основной - Шифрование паролей"
-
-#~ msgid ""
-#~ "This module replaces the cleartext password in the database with a password "
-#~ "hash,\n"
-#~ "preventing anyone from reading the original password.\n"
-#~ "For your existing user base, the removal of the cleartext passwords occurs "
-#~ "the first time\n"
-#~ "a user logs into the database, after installing base_crypt.\n"
-#~ "After installing this module it won't be possible to recover a forgotten "
-#~ "password for your\n"
-#~ "users, the only solution is for an admin to set a new password.\n"
-#~ "\n"
-#~ "Note: installing this module does not mean you can ignore basic security "
-#~ "measures,\n"
-#~ "as the password is still transmitted unencrypted on the network (by the "
-#~ "client),\n"
-#~ "unless you are using a secure protocol such as XML-RPCS.\n"
-#~ " "
-#~ msgstr ""
-#~ "Этот модуль заменяет текстовые пароли в базе данных на их хэши,\n"
-#~ "предотвращая хищение оригинальных паролей.\n"
-#~ "Для существующей базы пользователей, удаление текстового пароля происходит "
-#~ "при\n"
-#~ "первом входе пользователя после установки base_crypt.\n"
-#~ "После установки этого модуля станет невозможно восстановление пароля \n"
-#~ "пользователя. Возможна будет только замена пароля.\n"
-#~ "\n"
-#~ "Прим.: установка этого модуля не избавляет от необходимости соблюдать\n"
-#~ "базовые меры безопасности, поскольку пароли всё ещё передаются открытым\n"
-#~ "текстом по сети, если не используется безопасный протокол вроде XML-RPCS.\n"
-#~ " "
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index f461a675a47..1c38f7f4eae 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -2,8 +2,10 @@ import functools
import logging
import simplejson
+import werkzeug.utils
from werkzeug.exceptions import BadRequest
+import openerp
from openerp import SUPERUSER_ID
import openerp.addons.web.http as oeweb
from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect
@@ -69,6 +71,13 @@ class OAuthController(oeweb.Controller):
# auth_signup is not installed
_logger.error("auth_signup not installed on database %s: oauth sign up cancelled." % (dbname,))
url = "/#action=login&oauth_error=1"
+ except openerp.exceptions.AccessDenied:
+ # oauth credentials not valid, user could be on a temporary session
+ _logger.info('OAuth2: access denied, redirect to main page in case a valid session exists, without setting cookies')
+ url = "/#action=login&oauth_error=3"
+ redirect = werkzeug.utils.redirect(url, 303)
+ redirect.autocorrect_location_header = False
+ return redirect
except Exception, e:
# signup error
_logger.exception("OAuth2: %s" % str(e))
diff --git a/addons/auth_oauth_signup/i18n/ru.po b/addons/auth_oauth_signup/i18n/ru.po
new file mode 100644
index 00000000000..d1c4716c71c
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/ru.po
@@ -0,0 +1,23 @@
+# Russian 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-13 09:46+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Russian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-02-14 04:37+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Пользователи"
diff --git a/addons/auth_oauth_signup/res_users.py b/addons/auth_oauth_signup/res_users.py
index 83400f7c008..495331124b1 100644
--- a/addons/auth_oauth_signup/res_users.py
+++ b/addons/auth_oauth_signup/res_users.py
@@ -36,6 +36,8 @@ class res_users(osv.Model):
login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
except openerp.exceptions.AccessDenied:
+ if context and context.get('no_user_creation'):
+ return None
state = simplejson.loads(params['state'])
token = state.get('t')
oauth_uid = validation['user_id']
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index c2adc01cd54..d9b659b91fa 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -234,11 +234,12 @@
-
+
+
+
-
-
+
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index d5f90d8a653..294adc863b5 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -567,7 +567,8 @@ class crm_lead(base_stage, format_address, osv.osv):
for opportunity in opportunities:
subject.append(opportunity.name)
title = "%s : %s" % (opportunity.type == 'opportunity' and _('Merged opportunity') or _('Merged lead'), opportunity.name)
- details.append(self._mail_body(cr, uid, opportunity, CRM_LEAD_FIELDS_TO_MERGE, title=title, context=context))
+ fields = list(CRM_LEAD_FIELDS_TO_MERGE)
+ details.append(self._mail_body(cr, uid, opportunity, fields, title=title, context=context))
# Chatter message's subject
subject = subject[0] + ": " + ", ".join(subject[1:])
@@ -627,7 +628,10 @@ class crm_lead(base_stage, format_address, osv.osv):
opportunities = self.browse(cr, uid, ids, context=context)
sequenced_opps = []
for opportunity in opportunities:
- sequenced_opps.append((opportunity.stage_id and opportunity.stage_id.state != 'cancel' and opportunity.stage_id.sequence or 0, opportunity))
+ if opportunity.stage_id and opportunity.stage_id.state != 'cancel':
+ sequenced_opps.append((opportunity.stage_id.sequence, opportunity))
+ else:
+ sequenced_opps.append((-1, opportunity))
sequenced_opps.sort(key=lambda tup: tup[0], reverse=True)
opportunities = [opportunity for sequence, opportunity in sequenced_opps]
ids = [opportunity.id for opportunity in opportunities]
@@ -636,7 +640,8 @@ class crm_lead(base_stage, format_address, osv.osv):
tail_opportunities = opportunities_rest
- merged_data = self._merge_data(cr, uid, ids, highest, CRM_LEAD_FIELDS_TO_MERGE, context=context)
+ fields = list(CRM_LEAD_FIELDS_TO_MERGE)
+ merged_data = self._merge_data(cr, uid, ids, highest, fields, context=context)
# Merge messages and attachements into the first opportunity
self._merge_opportunity_history(cr, uid, highest.id, tail_opportunities, context=context)
@@ -651,7 +656,7 @@ class crm_lead(base_stage, format_address, osv.osv):
section_stages = self.pool.get('crm.case.section').read(cr, uid, merged_data['section_id'], ['stage_ids'], context=context)
if merged_data.get('stage_id') not in section_stages['stage_ids']:
stages_sequences = self.pool.get('crm.case.stage').search(cr, uid, [('id','in',section_stages['stage_ids'])], order='sequence', limit=1, context=context)
- merged_data['stage_id'] = stages_sequences[0]
+ merged_data['stage_id'] = stages_sequences and stages_sequences[0] or False
# Write merged data into first opportunity
self.write(cr, uid, [highest.id], merged_data, context=context)
# Delete tail opportunities
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3e9249aa6fa..fc43339ba8e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -327,6 +327,7 @@
+
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 32396b95f4e..e67b7c0c7be 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -58,11 +58,11 @@ class crm_lead2opportunity_partner(osv.osv_memory):
if partner_id:
# Search for opportunities that have the same partner and that arent done or cancelled
- ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id)])
+ ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('state', '!=', 'done')])
for id in ids:
tomerge.add(id)
if email:
- ids = lead_obj.search(cr, uid, [('email_from', 'ilike', email[0])])
+ ids = lead_obj.search(cr, uid, [('email_from', 'ilike', email[0]), ('state', '!=', 'done')])
for id in ids:
tomerge.add(id)
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 8bfd60fccec..00686de1c8e 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -21,7 +21,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 1dc98b6b68f..f68abeb8a52 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 2cffb6fb899..0d2837d6ca5 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -62,5 +62,66 @@
+
+ crm.lead.lead.geo_assign.inherit
+ crm.lead
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ crm.lead.lead.geo_assign.tree.inherit
+ crm.lead
+
+
+
+
+
+
+
+
+
+ crm.lead.partner.filter.assigned
+ crm.lead
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
index 14cd97b3e62..7e27428b63b 100644
--- a/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@ -1,4 +1,5 @@
import simplejson
+import urllib
import openerp.addons.web.http as openerpweb
import openerp.addons.web.controllers.main as webmain
@@ -14,11 +15,15 @@ class EDI(openerpweb.Controller):
modules_json = simplejson.dumps(modules)
js = "\n ".join('' % i for i in webmain.manifest_list(req, modules_str, 'js'))
css = "\n ".join('' % i for i in webmain.manifest_list(req, modules_str, 'css'))
+
+ # `url` may contain a full URL with a valid query string, we basically want to watch out for XML brackets and double-quotes
+ safe_url = urllib.quote_plus(url,':/?&;=')
+
return webmain.html_template % {
'js': js,
'css': css,
'modules': modules_json,
- 'init': 's.edi.edi_import("%s");' % url,
+ 'init': 's.edi.edi_import("%s");' % safe_url,
}
@openerpweb.jsonrequest
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 92465c1b84e..5700a07f519 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -371,7 +371,6 @@ class hr_applicant(base_stage, osv.Model):
update_vals = {}
update_vals.update({
- 'description': msg.get('body'),
'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
})
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index f709a224a45..b6a0bdd4ccf 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -187,6 +187,8 @@
domain="[('date_action','<>',False)]" help="Filter and view on next actions and date"/>
+
+
diff --git a/addons/knowledge/i18n/hu.po b/addons/knowledge/i18n/hu.po
index d34305492f8..d6ff50f6700 100644
--- a/addons/knowledge/i18n/hu.po
+++ b/addons/knowledge/i18n/hu.po
@@ -7,24 +7,24 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-01 10:13+0000\n"
-"Last-Translator: Krisztian Eyssen \n"
+"PO-Revision-Date: 2013-02-14 15:58+0000\n"
+"Last-Translator: krnkris \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Documents"
-msgstr ""
+msgstr "Dokumentumok"
#. module: knowledge
#: model:ir.model,name:knowledge.model_knowledge_config_settings
msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
#. module: knowledge
#: help:knowledge.config.settings,module_document_webdav:0
@@ -32,11 +32,13 @@ msgid ""
"Access your documents in OpenERP through WebDAV.\n"
" This installs the module document_webdav."
msgstr ""
+"Az OpenERP dokumentumok WebDAV-on keresztüli elérése.\n"
+" Ez a document_webdav modult telepíti."
#. module: knowledge
#: help:knowledge.config.settings,module_document_page:0
msgid "This installs the module document_page."
-msgstr ""
+msgstr "Ez a document_page modult telepíti."
#. module: knowledge
#: model:ir.ui.menu,name:knowledge.menu_document2
@@ -47,12 +49,12 @@ msgstr "Csoportmunában készült tartalom"
#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
#: view:knowledge.config.settings:0
msgid "Configure Knowledge"
-msgstr ""
+msgstr "Tudástár beállítása"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Knowledge and Documents Management"
-msgstr ""
+msgstr "Tudástár és dokumentum kezelés"
#. module: knowledge
#: help:knowledge.config.settings,module_document:0
@@ -62,31 +64,36 @@ msgid ""
"and a document dashboard.\n"
" This installs the module document."
msgstr ""
+"Ez egy komplett dokumentum kezelő rendszer, beleértve: felhasználó "
+"hitelesítást,\n"
+" teljes dokumentum keresőt (de a pptx és docx nem "
+"támogatott), és egy dokumentum vezérlőpultot.\n"
+" Ez a document modult telepíti."
#. module: knowledge
#: field:knowledge.config.settings,module_document_page:0
msgid "Create static web pages"
-msgstr ""
+msgstr "Statikus weboldalak készítése"
#. module: knowledge
#: field:knowledge.config.settings,module_document_ftp:0
msgid "Share repositories (FTP)"
-msgstr ""
+msgstr "Elérési út (FTP) megosztás"
#. module: knowledge
#: field:knowledge.config.settings,module_document:0
msgid "Manage documents"
-msgstr ""
+msgstr "Dokumentum kezelés"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Cancel"
-msgstr ""
+msgstr "Mégsem"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Alkalmaz"
#. module: knowledge
#: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -99,16 +106,18 @@ msgid ""
"Access your documents in OpenERP through an FTP interface.\n"
" This installs the module document_ftp."
msgstr ""
+"Az OpenERP dokumentumok elérése egy FTP csatolón keresztül.\n"
+" Ez a document_ftp modult telepíti."
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "or"
-msgstr ""
+msgstr "vagy"
#. module: knowledge
#: field:knowledge.config.settings,module_document_webdav:0
msgid "Share repositories (WebDAV)"
-msgstr ""
+msgstr "Elérési útvonal (webDAV) megosztás"
#. module: knowledge
#: model:ir.ui.menu,name:knowledge.menu_document
diff --git a/addons/l10n_multilang/i18n/hu.po b/addons/l10n_multilang/i18n/hu.po
new file mode 100644
index 00000000000..b56463cc70e
--- /dev/null
+++ b/addons/l10n_multilang/i18n/hu.po
@@ -0,0 +1,174 @@
+# 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: 2012-02-08 01:06+0000\n"
+"PO-Revision-Date: 2013-02-14 16:15+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-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "ÁFA pozíció sablon"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "A főkönyvi számla számának egyedinek kell lennie!"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"Beállítási hiba!\n"
+"Nem tud al-számlát létrehozni egy számlához, melynek a belső \"Nézet\" "
+"típusa különböző! "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "Analitikus/Gyüjtő napló"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Hiba! Nem hozhat létre rekurzív főkönyvi számla sablonokat."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "Napló"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Számlatükör sablonok"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "A leírás egyedi kell legyen minden vállalathoz!"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Hiba! Nem hozhat létre rekurzív adógyűjtőket."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "Főkönyvi számla"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Beállítási hiba! A választott pénznemet meg kell osztani az alapértelmezett "
+"főkönyvi számlával is."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Főkönyvi számla sablonok"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+"Adja meg itt a nyelvet amelyen a sablon be fog töltődni a lokalizációs modul "
+"telepítése után és az át lesz másolva a végső objektumba a sablonokból való "
+"létrehozás után. A nyelvi kódot ';' kell elválasztani."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Hiba! Nem hozhat létre rekurzív számlákat."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "A napló nevének egyedinek kell lennie mindegyik vállalatra!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitikus/elemző könyvelés"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "A napló kódjának egyedinek kell lennie mindegyik vállalathoz!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "Költségvetési pozíció"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"Beállítási hiba! \n"
+"Nem tud al-számlát létrehozni egy számlához, melynek a belső \"Nézet\" "
+"típusa különböző! "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "Beszélt nyelvek"
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 3d3117c1b51..817c0a71fa4 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-02-12 17:52+0000\n"
+"PO-Revision-Date: 2013-02-14 16:43+0000\n"
"Last-Translator: krnkris \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-13 04:36+0000\n"
+"X-Launchpad-Export-Date: 2013-02-15 04:38+0000\n"
"X-Generator: Launchpad (build 16491)\n"
#. module: mail
@@ -906,12 +906,12 @@ msgstr "Alcsoportba rakott üzenetek"
#. module: mail
#: field:mail.alias,alias_user_id:0
msgid "Owner"
-msgstr ""
+msgstr "Tulajdonos"
#. module: mail
#: model:ir.model,name:mail.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Felhasználók"
#. module: mail
#: model:ir.model,name:mail.model_mail_message
@@ -920,25 +920,25 @@ msgstr ""
#: field:mail.notification,message_id:0
#: field:mail.wizard.invite,message:0
msgid "Message"
-msgstr ""
+msgstr "Üzenet"
#. module: mail
#: help:mail.followers,res_id:0
#: help:mail.wizard.invite,res_id:0
msgid "Id of the followed resource"
-msgstr ""
+msgstr "A követett forrás ID azonosítója"
#. module: mail
#: field:mail.compose.message,body:0
#: field:mail.message,body:0
msgid "Contents"
-msgstr ""
+msgstr "Tartalmak"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_alias
#: model:ir.ui.menu,name:mail.mail_alias_menu
msgid "Aliases"
-msgstr ""
+msgstr "Álnevek"
#. module: mail
#: help:mail.message.subtype,description:0
@@ -946,40 +946,44 @@ msgid ""
"Description that will be added in the message posted for this subtype. If "
"void, the name will be added instead."
msgstr ""
+"Leírás ami hozzá lesz adva az altípusnak elküldendő üzenethez. Ha üres, a "
+"név lesz hozzáadva helyette."
#. module: mail
#: field:mail.compose.message,vote_user_ids:0
#: field:mail.message,vote_user_ids:0
msgid "Votes"
-msgstr ""
+msgstr "Szavazatok"
#. module: mail
#: view:mail.group:0
msgid "Group"
-msgstr ""
+msgstr "Csoport"
#. module: mail
#: help:mail.compose.message,starred:0
#: help:mail.message,starred:0
msgid "Current user has a starred notification linked to this message"
msgstr ""
+"A jelenlegi felhasználónak van egy kicsillagozott értesítése mely hozzá van "
+"rendelve az üzenethez."
#. module: mail
#: field:mail.group,public:0
msgid "Privacy"
-msgstr ""
+msgstr "Adatvédelem"
#. module: mail
#: view:mail.mail:0
msgid "Notification"
-msgstr ""
+msgstr "Értesítés"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/mail.js:585
#, python-format
msgid "Please complete partner's informations"
-msgstr ""
+msgstr "Kérem egészítse ki a partner információkat"
#. module: mail
#: view:mail.wizard.invite:0
@@ -994,7 +998,7 @@ msgstr "A kijelölt elemek követői és"
#. module: mail
#: field:mail.alias,alias_force_thread_id:0
msgid "Record Thread ID"
-msgstr ""
+msgstr "Összefűzési azonosító ID elmentése"
#. module: mail
#: model:ir.ui.menu,name:mail.mail_group_root
@@ -1013,12 +1017,21 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Nem található üzenet és nem lett még elküldve üzenet.\n"
+"
\n"
+" Kattintson felül jobbra az ikonra egy üzenet "
+"összeállításához. Ez az\n"
+" üzenet lesz elküldve e-mailként, ha ez egy belső "
+"kapcsolat.\n"
+"
\n"
+" "
#. module: mail
#: view:mail.mail:0
#: field:mail.mail,state:0
msgid "Status"
-msgstr ""
+msgstr "Állapot"
#. module: mail
#: view:mail.mail:0
@@ -1029,13 +1042,13 @@ msgstr "Kimenő"
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "All feeds"
-msgstr ""
+msgstr "Összes betáplálás"
#. module: mail
#: help:mail.compose.message,record_name:0
#: help:mail.message,record_name:0
msgid "Name get of the related document."
-msgstr ""
+msgstr "A név az ide vonatkozó dokumentumról levéve."
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -1046,12 +1059,12 @@ msgstr ""
#: field:mail.message,notification_ids:0
#: view:mail.notification:0
msgid "Notifications"
-msgstr ""
+msgstr "Értesítések"
#. module: mail
#: view:mail.alias:0
msgid "Search Alias"
-msgstr ""
+msgstr "Álnév keresés"
#. module: mail
#: help:mail.alias,alias_force_thread_id:0
@@ -1060,6 +1073,9 @@ msgid ""
"attached, even if they did not reply to it. If set, this will disable the "
"creation of new records completely."
msgstr ""
+"Az összefűzés (rekord) választható ID azonosítója, amely minden beérkezett "
+"üzenethez hozzá lesz mellékleve, még akkor is ha nem válaszoltak rá. Ha "
+"beállított, akkor teljesen ki lesz kapcsolva az új rekord létrehozása."
#. module: mail
#: help:mail.message.subtype,name:0
@@ -1070,28 +1086,33 @@ msgid ""
"subtypes allow to precisely tune the notifications the user want to receive "
"on its wall."
msgstr ""
+"Üzenet altípus sokkal pontosabb típust ad az üzenetekhez, főként a rendszer "
+"értesítésekhez. Például, az értesítés kapcsolódhat új rekordhoz (Új), vagy "
+"egy szakasz változás a műveletben (Szakasz változás). Üzenet altípusok "
+"lehetővé teszik az értesítések pontos behangolását, melyeket a felhasználó "
+"az üzenet falán látni szeretne."
#. module: mail
#: view:mail.mail:0
msgid "by"
-msgstr ""
+msgstr "által"
#. module: mail
#: model:mail.group,name:mail.group_best_sales_practices
msgid "Best Sales Practices"
-msgstr ""
+msgstr "Legjobb Értékesítési Praktikák"
#. module: mail
#: selection:mail.group,public:0
msgid "Selected Group Only"
-msgstr ""
+msgstr "Csak a kiválasztott csoport"
#. module: mail
#: field:mail.group,message_is_follower:0
#: field:mail.thread,message_is_follower:0
#: field:res.partner,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Ez egy követő"
#. module: mail
#: view:mail.alias:0
@@ -1102,12 +1123,12 @@ msgstr "Felhasználó"
#. module: mail
#: view:mail.group:0
msgid "Groups"
-msgstr ""
+msgstr "Csoportok"
#. module: mail
#: view:mail.message:0
msgid "Messages Search"
-msgstr ""
+msgstr "Üzenetek keresése"
#. module: mail
#: field:mail.compose.message,date:0
@@ -1144,19 +1165,19 @@ msgstr "Bejegyzés írás a követőimnek"
#. module: mail
#: model:ir.model,name:mail.model_res_groups
msgid "Access Groups"
-msgstr ""
+msgstr "Csoportok hozzáférése"
#. module: mail
#: field:mail.message.subtype,default:0
msgid "Default"
-msgstr ""
+msgstr "Alapértelmezett"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:260
#, python-format
msgid "show more message"
-msgstr ""
+msgstr "mutassa a többi üzenetet"
#. module: mail
#. openerp-web
@@ -1168,25 +1189,27 @@ msgstr "Megjelölés feladatkét"
#. module: mail
#: help:mail.message.subtype,parent_id:0
msgid "Parent subtype, used for automatic subscription."
-msgstr ""
+msgstr "Szülő altípus, ami automatikus feliratkozáshoz használt."
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
msgid "Invite wizard"
-msgstr ""
+msgstr "Meghívó varázsló"
#. module: mail
#: field:mail.group,message_summary:0
#: field:mail.thread,message_summary:0
#: field:res.partner,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Összegzés"
#. module: mail
#: help:mail.message.subtype,res_model:0
msgid ""
"Model the subtype applies to. If False, this subtype applies to all models."
msgstr ""
+"Az altípushoz alkalmazott minta. Ha téves, akkor ez az altípus lesz "
+"használva az összes mintához."
#. module: mail
#: field:mail.compose.message,subtype_id:0
@@ -1194,32 +1217,32 @@ msgstr ""
#: field:mail.message,subtype_id:0
#: view:mail.message.subtype:0
msgid "Subtype"
-msgstr ""
+msgstr "Altípus"
#. module: mail
#: view:mail.group:0
msgid "Group Form"
-msgstr ""
+msgstr "Csoport űrlap"
#. module: mail
#: field:mail.compose.message,starred:0
#: field:mail.message,starred:0
#: field:mail.notification,starred:0
msgid "Starred"
-msgstr ""
+msgstr "Csillagozott"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:262
#, python-format
msgid "more messages"
-msgstr ""
+msgstr "több üzenet"
#. module: mail
#: code:addons/mail/update.py:93
#, python-format
msgid "Error"
-msgstr ""
+msgstr "Hiba"
#. module: mail
#. openerp-web
@@ -1233,6 +1256,7 @@ msgstr "Követés"
msgid ""
"Unfortunately this email alias is already used, please choose a unique one"
msgstr ""
+"Sajnos ez az email álnév már használva van, kérem válasszon egy egyedit."
#. module: mail
#: help:mail.alias,alias_user_id:0
@@ -1242,19 +1266,24 @@ msgid ""
"the sender (From) address, or will use the Administrator account if no "
"system user is found for that address."
msgstr ""
+"A rekord tulajdonosa létrehozva amikor erre az álnévre e-mailek érkeznek. "
+"Ha ez a mező nincs kialakítva akkor a rendszer megpróbálja megkeresni a "
+"jogos tulajdonost a elküldési (űrlap) címről, vagy az adminisztrátor "
+"felhasználót fogja használni ha nem talált rendszer felhasználót azzal a "
+"címmel."
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail_followers.xml:52
#, python-format
msgid "And"
-msgstr ""
+msgstr "És"
#. module: mail
#: field:mail.compose.message,message_id:0
#: field:mail.message,message_id:0
msgid "Message-Id"
-msgstr ""
+msgstr "Üzenet-ID azonosító"
#. module: mail
#: help:mail.group,image:0
@@ -1262,6 +1291,7 @@ msgid ""
"This field holds the image used as photo for the group, limited to "
"1024x1024px."
msgstr ""
+"Ez a mező a képet tárolja amit a csoporthoz használ, limitálva 1024x1024px."
#. module: mail
#: field:mail.compose.message,attachment_ids:0
@@ -1274,7 +1304,7 @@ msgstr "Mellékletek"
#: field:mail.compose.message,record_name:0
#: field:mail.message,record_name:0
msgid "Message Record Name"
-msgstr ""
+msgstr "Üzenet rekord név"
#. module: mail
#: field:mail.mail,email_cc:0
@@ -1284,7 +1314,7 @@ msgstr "Másolat"
#. module: mail
#: help:mail.notification,starred:0
msgid "Starred message that goes into the todo mailbox"
-msgstr ""
+msgstr "Csillagos üzenet amely a teendők levélládába megy"
#. module: mail
#. openerp-web
@@ -1292,24 +1322,25 @@ msgstr ""
#: view:mail.compose.message:0
#, python-format
msgid "Followers of"
-msgstr ""
+msgstr "Követők ehhez"
#. module: mail
#: help:mail.mail,auto_delete:0
msgid "Permanently delete this email after sending it, to save space"
msgstr ""
+"Tartósan törli ezt az üzenetet az elküldés után, hely felszabadítása miatt"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_group_feeds
msgid "Discussion Group"
-msgstr ""
+msgstr "Megbeszélés csoport"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:224
#, python-format
msgid "Done"
-msgstr ""
+msgstr "Kész"
#. module: mail
#: model:mail.message.subtype,name:mail.mt_comment
@@ -1326,7 +1357,7 @@ msgstr "Követ"
#. module: mail
#: field:mail.group,name:0
msgid "Name"
-msgstr ""
+msgstr "Név"
#. module: mail
#: model:mail.group,name:mail.group_all_employees
@@ -1339,45 +1370,45 @@ msgstr "Teljes vállalat"
#: view:mail.compose.message:0
#, python-format
msgid "and"
-msgstr ""
+msgstr "és"
#. module: mail
#: help:mail.mail,body_html:0
msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Rich-text/HTML üzenet"
#. module: mail
#: view:mail.mail:0
msgid "Creation Month"
-msgstr ""
+msgstr "Létrehozás hónapja"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:272
#, python-format
msgid "Compose new Message"
-msgstr ""
+msgstr "Új üzenet létrehozása"
#. module: mail
#: field:mail.group,menu_id:0
msgid "Related Menu"
-msgstr ""
+msgstr "Kapcsolódó menü"
#. module: mail
#: view:mail.message:0
msgid "Content"
-msgstr ""
+msgstr "Tartalom"
#. module: mail
#: field:mail.mail,email_to:0
msgid "To"
-msgstr ""
+msgstr "Címzett"
#. module: mail
#: field:mail.compose.message,notified_partner_ids:0
#: field:mail.message,notified_partner_ids:0
msgid "Notified partners"
-msgstr ""
+msgstr "Értesített partnerek"
#. module: mail
#: help:mail.group,public:0
@@ -1385,11 +1416,13 @@ msgid ""
"This group is visible by non members. Invisible groups can add "
"members through the invite button."
msgstr ""
+"Ez a csoport azoknak is látható akik nem tagok. A nem látható csoportok "
+"tagokat adhatnak a meghívó gombbal."
#. module: mail
#: model:mail.group,name:mail.group_board
msgid "Board meetings"
-msgstr ""
+msgstr "Tanácskozás"
#. module: mail
#: constraint:mail.alias:0
@@ -1397,40 +1430,42 @@ msgid ""
"Invalid expression, it must be a literal python dictionary definition e.g. "
"\"{'field': 'value'}\""
msgstr ""
+"Nem érvényes kifejezés, ennek python szótár kifejezésnek kell lennie pl.: "
+"\"{'field': 'value'}\""
#. module: mail
#: field:mail.alias,alias_model_id:0
msgid "Aliased Model"
-msgstr ""
+msgstr "Minta álnév"
#. module: mail
#: help:mail.compose.message,message_id:0
#: help:mail.message,message_id:0
msgid "Message unique identifier"
-msgstr ""
+msgstr "Üzenet egyedi azonosító"
#. module: mail
#: field:mail.group,description:0
#: field:mail.message.subtype,description:0
msgid "Description"
-msgstr ""
+msgstr "Leírás"
#. module: mail
#: model:ir.model,name:mail.model_mail_followers
msgid "Document Followers"
-msgstr ""
+msgstr "Követők dokumentuma"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail_followers.xml:35
#, python-format
msgid "Remove this follower"
-msgstr ""
+msgstr "Követő eltávolítása"
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "Never"
-msgstr ""
+msgstr "Soha"
#. module: mail
#: field:mail.mail,mail_server_id:0
@@ -1441,7 +1476,7 @@ msgstr "Kimenő levelező szerver"
#: code:addons/mail/mail_message.py:920
#, python-format
msgid "Partners email addresses not found"
-msgstr ""
+msgstr "A partnerek e-mail címei nem találhatóak"
#. module: mail
#: view:mail.mail:0
@@ -1452,19 +1487,21 @@ msgstr "Elküldött"
#. module: mail
#: field:mail.mail,body_html:0
msgid "Rich-text Contents"
-msgstr ""
+msgstr "Rich-text tartalmak"
#. module: mail
#: help:mail.compose.message,to_read:0
#: help:mail.message,to_read:0
msgid "Current user has an unread notification linked to this message"
msgstr ""
+"A jelenlegi felhasználónak van egy olvasatlan értesítése ehhez az üzenethez "
+"csatolva"
#. module: mail
#: help:res.partner,notification_email_send:0
msgid ""
"Choose in which case you want to receive an email when you receive new feeds."
-msgstr ""
+msgstr "Válassza ki milyen esetekben kíván e-mail kapni az új bevitelekből."
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_groups
@@ -1480,13 +1517,17 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" nincs üzenete ebben a csoportban.\n"
+"
\n"
+" "
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:195
#, python-format
msgid "Please, wait while the file is uploading."
-msgstr ""
+msgstr "Kérem várjon amíg a fájl feltöltődik."
#. module: mail
#: view:mail.group:0
@@ -1496,6 +1537,9 @@ msgid ""
"installed\n"
" the portal module."
msgstr ""
+"Ez a csoport mindenki számára látható,\n"
+" az ügyfeleinek is, ha telepítette a\n"
+" portal modult."
#. module: mail
#. openerp-web
@@ -1509,17 +1553,17 @@ msgstr "Visszahelyezés a feladatokhoz"
#: code:addons/mail/static/src/xml/mail.xml:113
#, python-format
msgid "this document"
-msgstr ""
+msgstr "ez a dokumentum"
#. module: mail
#: field:mail.compose.message,filter_id:0
msgid "Filters"
-msgstr ""
+msgstr "Szűrők"
#. module: mail
#: field:res.partner,notification_email_send:0
msgid "Receive Feeds by Email"
-msgstr ""
+msgstr "Új hozzászólások e-mailen fogadva"
#. module: mail
#: help:base.config.settings,alias_domain:0
@@ -1527,6 +1571,8 @@ msgid ""
"If you have setup a catch-all email domain redirected to the OpenERP server, "
"enter the domain name here."
msgstr ""
+"Ha be állítja az összes e-mail fogadása domain átirányítás az openERP "
+"szerverre, akkor írja ide a domain nevet."
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -1543,7 +1589,7 @@ msgstr "Üzenetek"
#: code:addons/mail/static/src/xml/mail.xml:126
#, python-format
msgid "others..."
-msgstr ""
+msgstr "mások..."
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_star_feeds
@@ -1557,12 +1603,12 @@ msgstr "Feladat"
#: field:mail.group,alias_id:0
#: field:res.users,alias_id:0
msgid "Alias"
-msgstr ""
+msgstr "Álnév"
#. module: mail
#: model:ir.model,name:mail.model_mail_mail
msgid "Outgoing Mails"
-msgstr ""
+msgstr "Elküldött levelek"
#. module: mail
#: help:mail.compose.message,notification_ids:0
@@ -1571,6 +1617,8 @@ msgid ""
"Technical field holding the message notifications. Use notified_partner_ids "
"to access notified partners."
msgstr ""
+"Technikai mező a értesítés üzenetek tárolásához. Használja a "
+"notified_partner_ids az értesített partnerek eléréséhez."
#. module: mail
#: model:ir.ui.menu,name:mail.mail_feeds
@@ -1582,12 +1630,12 @@ msgstr "Üzenetek"
#: view:mail.alias:0
#: field:mail.message.subtype,res_model:0
msgid "Model"
-msgstr ""
+msgstr "Modell"
#. module: mail
#: view:mail.message:0
msgid "Unread"
-msgstr ""
+msgstr "Olvasatlan"
#. module: mail
#: help:mail.followers,subtype_ids:0
@@ -1595,23 +1643,25 @@ msgid ""
"Message subtypes followed, meaning subtypes that will be pushed onto the "
"user's Wall."
msgstr ""
+"Üzenet altípus követve, azt jelenti, hogy az altípus ki lesz rakva a "
+"felhasználó üzenőfalára."
#. module: mail
#: help:mail.group,message_ids:0
#: help:mail.thread,message_ids:0
#: help:res.partner,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Üzenetek és kommunikáció történet"
#. module: mail
#: help:mail.mail,references:0
msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Üzenet hivatkozások, mint előző üzenetek azonosítói"
#. module: mail
#: field:mail.compose.message,composition_mode:0
msgid "Composition mode"
-msgstr ""
+msgstr "Összeállítási mód"
#. module: mail
#: field:mail.compose.message,model:0
@@ -1619,14 +1669,14 @@ msgstr ""
#: field:mail.message,model:0
#: field:mail.wizard.invite,res_model:0
msgid "Related Document Model"
-msgstr ""
+msgstr "Ide vonatkozó dokumentum modell"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:287
#, python-format
msgid "unlike"
-msgstr ""
+msgstr "nem valószínű"
#. module: mail
#: help:mail.compose.message,author_id:0
@@ -1635,22 +1685,24 @@ msgid ""
"Author of the message. If not set, email_from may hold an email address that "
"did not match any partner."
msgstr ""
+"Az üzenet szerzője. Ha nincs beállítva, az e-mail ettől, egy címet "
+"tartalmaz ami nem mutat egyik partnerre sem."
#. module: mail
#: help:mail.mail,email_cc:0
msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Üzenet másolat címzettjei"
#. module: mail
#: field:mail.alias,alias_domain:0
msgid "Alias domain"
-msgstr ""
+msgstr "Álénév domain"
#. module: mail
#: code:addons/mail/update.py:93
#, python-format
msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Hiba a kiadó garancia szerverével történő kommunikációval."
#. module: mail
#: selection:mail.group,public:0
@@ -1670,32 +1722,41 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Nincs teendő.\n"
+"
\n"
+" Ha a Beérkezett üzeneteinél végez műveletet, "
+"megjelölheti\n"
+" mint teendő. Ebből a menüből, minden teendőjét "
+"elvégezheti.\n"
+"
\n"
+" "
#. module: mail
#: selection:mail.mail,state:0
msgid "Delivery Failed"
-msgstr ""
+msgstr "Küldés sikertelen"
#. module: mail
#: field:mail.compose.message,partner_ids:0
msgid "Additional contacts"
-msgstr ""
+msgstr "További kapcsolatok"
#. module: mail
#: help:mail.compose.message,parent_id:0
#: help:mail.message,parent_id:0
msgid "Initial thread message."
-msgstr ""
+msgstr "Elsődleges összefűzött üzenet."
#. module: mail
#: model:mail.group,name:mail.group_hr_policies
msgid "HR Policies"
-msgstr ""
+msgstr "HR Emberi erőforrás menedzsment házirend"
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "Emails only"
-msgstr ""
+msgstr "Kizárólag e-mailek"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_inbox_feeds
@@ -1708,35 +1769,35 @@ msgstr "Beérkezett üzenetek"
#: code:addons/mail/static/src/xml/mail.xml:58
#, python-format
msgid "File"
-msgstr ""
+msgstr "Fájl"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/many2many_tags_email.js:63
#, python-format
msgid "Please complete partner's informations and Email"
-msgstr ""
+msgstr "Kérem egészítse ki a partner információkat és e-mailjét"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_message_subtype
#: model:ir.ui.menu,name:mail.menu_message_subtype
msgid "Subtypes"
-msgstr ""
+msgstr "Altípusok"
#. module: mail
#: model:ir.model,name:mail.model_mail_alias
msgid "Email Aliases"
-msgstr ""
+msgstr "e-amil álnevek"
#. module: mail
#: field:mail.group,image_small:0
msgid "Small-sized photo"
-msgstr ""
+msgstr "Kis-méretű fotó"
#. module: mail
#: help:mail.mail,reply_to:0
msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Előnyben részesített válasz cím ehhez az üzenethez"
#~ msgid "Open Attachments"
#~ msgstr "Mellékletek megnyitása"
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 16587ae24fd..77573f0d2f8 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -310,8 +310,8 @@ class mail_message(osv.Model):
partner_tree = dict((partner[0], partner) for partner in partners)
# 2. Attachments as SUPERUSER, because could receive msg and attachments for doc uid cannot see
- attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname'], context=context)
- attachments_tree = dict((attachment['id'], {'id': attachment['id'], 'filename': attachment['datas_fname']}) for attachment in attachments)
+ attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname', 'name'], context=context)
+ attachments_tree = dict((attachment['id'], {'id': attachment['id'], 'filename': attachment['datas_fname'], 'name': attachment['name']}) for attachment in attachments)
# 3. Update message dictionaries
for message_dict in messages:
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9d7237ca907..7a2be4aed01 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -773,7 +773,7 @@ class mail_thread(osv.AbstractModel):
msg_dict['author_id'] = author_ids[0]
else:
msg_dict['email_from'] = message.get('from')
- partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context)
+ partner_ids = self._message_find_partners(cr, uid, message, ['To', 'Cc'], context=context)
msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids]
if 'Date' in message:
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0b3bddffde1..0872d049162 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -104,8 +104,8 @@ openerp.mail = function (session) {
// returns the file type of a file based on its extension
// As it only looks at the extension it is quite approximative.
filetype: function(url){
- url = url.filename || url;
- var tokens = (url+'').split('.');
+ var url = url && url.filename || url;
+ var tokens = typeof url == 'string' ? url.split('.') : [];
if(tokens.length <= 1){
return 'unknown';
}
diff --git a/addons/marketing/i18n/hu.po b/addons/marketing/i18n/hu.po
index 48acf144f2e..cc8760c35a6 100644
--- a/addons/marketing/i18n/hu.po
+++ b/addons/marketing/i18n/hu.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-31 14:00+0000\n"
-"Last-Translator: Krisztian Eyssen \n"
+"PO-Revision-Date: 2013-02-14 16:51+0000\n"
+"Last-Translator: krnkris \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
#. module: marketing
#: model:ir.model,name:marketing.model_marketing_config_settings
msgid "marketing.config.settings"
-msgstr ""
+msgstr "marketing.config.settings"
#. module: marketing
#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
@@ -33,7 +33,7 @@ msgstr ""
#: model:ir.actions.act_window,name:marketing.action_marketing_configuration
#: view:marketing.config.settings:0
msgid "Configure Marketing"
-msgstr ""
+msgstr "Értékesítés beállítás"
#. module: marketing
#: view:crm.lead:0
@@ -44,47 +44,47 @@ msgstr "Marketing"
#. module: marketing
#: field:marketing.config.settings,module_marketing_campaign:0
msgid "Marketing campaigns"
-msgstr ""
+msgstr "Értékesítési kampány"
#. module: marketing
#: view:marketing.config.settings:0
msgid "or"
-msgstr ""
+msgstr "vagy"
#. module: marketing
#: view:marketing.config.settings:0
msgid "Campaigns"
-msgstr ""
+msgstr "Kampányok"
#. module: marketing
#: model:res.groups,name:marketing.group_marketing_manager
msgid "Manager"
-msgstr ""
+msgstr "Igazgató"
#. module: marketing
#: model:res.groups,name:marketing.group_marketing_user
msgid "User"
-msgstr ""
+msgstr "Felhasználó"
#. module: marketing
#: view:marketing.config.settings:0
msgid "Campaigns Settings"
-msgstr ""
+msgstr "Kampány beállítások"
#. module: marketing
#: field:marketing.config.settings,module_crm_profiling:0
msgid "Track customer profile to focus your campaigns"
-msgstr ""
+msgstr "Vevő profil nyomonkövetése a kampányra összpontosítva"
#. module: marketing
#: view:marketing.config.settings:0
msgid "Cancel"
-msgstr ""
+msgstr "Mégsem"
#. module: marketing
#: view:marketing.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Alkalmaz"
#. module: marketing
#: help:marketing.config.settings,module_marketing_campaign:0
@@ -101,11 +101,13 @@ msgid ""
"Allows users to perform segmentation within partners.\n"
" This installs the module crm_profiling."
msgstr ""
+"A felhasználóknak engedélyezi a partnerek kiválogatását.\n"
+" Ez telepíti a crm_profiling modult."
#. module: marketing
#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
msgid "Demo data for marketing campaigns"
-msgstr ""
+msgstr "Demo adatok a merketing kampányhoz"
#~ msgid "Configure Your Marketing Application"
#~ msgstr "Marketing alkalmazásainak beállítása"
diff --git a/addons/marketing_campaign_crm_demo/i18n/hu.po b/addons/marketing_campaign_crm_demo/i18n/hu.po
index 8c3b1bb2be9..a4a68e0e584 100644
--- a/addons/marketing_campaign_crm_demo/i18n/hu.po
+++ b/addons/marketing_campaign_crm_demo/i18n/hu.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-21 15:22+0000\n"
-"Last-Translator: Krisztian Eyssen \n"
+"PO-Revision-Date: 2013-02-13 12:33+0000\n"
+"Last-Translator: krnkris \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-22 05:59+0000\n"
-"X-Generator: Launchpad (build 16378)\n"
+"X-Launchpad-Export-Date: 2013-02-14 04:37+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
#. module: marketing_campaign_crm_demo
#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
@@ -28,6 +28,14 @@ msgid ""
"reply to this message.\n"
"
Regards,OpenERP Team,
"
msgstr ""
+"
Hello,
\n"
+"
Köszönjük érdeklődésedet és feliratkozásodat a műszaki "
+"képzésre.
Ha további információra van szükség, küldj választ erre az "
+"üzenetre.
\n"
+"
Tisztelettel,OpenERP csapata,
"
#. module: marketing_campaign_crm_demo
#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -37,7 +45,7 @@ msgstr "Marketingkampány demojelentés"
#. module: marketing_campaign_crm_demo
#: model:email.template,subject:marketing_campaign_crm_demo.email_template_8
msgid "Thanks for subscribing to technical training"
-msgstr ""
+msgstr "Köszönjük a feliratkozást a műszaki képzésre"
#. module: marketing_campaign_crm_demo
#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_3
@@ -49,6 +57,12 @@ msgid ""
"reply to this message.\n"
"
Regards,OpenERP Team,
"
msgstr ""
+"
Hello,
\n"
+"
Köszönjük érdeklődésedet és feliratkozásodat az OpenERP "
+"felfedező napra.
\n"
+"
Ha további információra van szükség, küldj válasz választ "
+"erre az üzenetre.
\n"
+"
Tisztelettel,OpenERP csapat,
"
#. module: marketing_campaign_crm_demo
#: report:crm.lead.demo:0
@@ -58,7 +72,7 @@ msgstr "Vállalat :"
#. module: marketing_campaign_crm_demo
#: model:email.template,subject:marketing_campaign_crm_demo.email_template_4
msgid "Thanks for buying the OpenERP book"
-msgstr ""
+msgstr "Köszönjük, hogy megvásárolta az OpenERP könyvet"
#. module: marketing_campaign_crm_demo
#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_6
@@ -71,16 +85,23 @@ msgid ""
"reply to this message.\n"
"
Regards,OpenERP Team,
"
msgstr ""
+"
Hello,
\n"
+"
Van egy nagyon jó ajánlatunk ami megfelelhet Önnek.\n"
+" Az ezüst tagjainknak, mi fizetjük a műszaki oktatást 2013 "
+"Júniusában.
\n"
+"
Ha további információra van szükség, küldj válasz választ "
+"erre az üzenetre.
\n"
+"
Tisztelettel,OpenERP csapat,
"
#. module: marketing_campaign_crm_demo
#: model:email.template,subject:marketing_campaign_crm_demo.email_template_1
msgid "Thanks for showing interest in OpenERP"
-msgstr ""
+msgstr "Köszönjük érdeklődését az OpenERP iránt"
#. module: marketing_campaign_crm_demo
#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
msgid "Dummy Action"
-msgstr ""
+msgstr "Látszólagos művelet"
#. module: marketing_campaign_crm_demo
#: report:crm.lead.demo:0
@@ -98,6 +119,13 @@ msgid ""
"reply to this message.\n"
"
Regards,OpenERP Team,
"
msgstr ""
+"
Hello,
\n"
+"
an egy nagyon jó ajánlatunk ami megfelelhet Önnek.\n"
+" Ajánljuk, hogy iratkozzon fel az OpenERP felfedező napra 2013 "
+"májusában.
\n"
+"
Ha további információra van szükség, küldj válasz választ "
+"erre az üzenetre.
\n"
+"
Tisztelettel,OpenERP csapat,
"
#. module: marketing_campaign_crm_demo
#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_5
@@ -110,26 +138,33 @@ msgid ""
"reply to this message.\n"
"
Regards,OpenERP Team,
"
msgstr ""
+"
Hello,
\n"
+"
an egy nagyon jó ajánlatunk ami megfelelhet Önnek.\n"
+" Az arany partnereknek, mi szervezzük az ingyenes oktatást 2013 "
+"Júniusában.
\n"
+"
Ha további információra van szükség, küldj válasz választ "
+"erre az üzenetre.
\n"
+"
Tisztelettel,OpenERP csapat,
"
#. module: marketing_campaign_crm_demo
#: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr ""
+msgstr "Javasolja a feliratkozást az OpenERP felfedező napra 2013 Májusában"
#. module: marketing_campaign_crm_demo
#: model:email.template,subject:marketing_campaign_crm_demo.email_template_3
msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
+msgstr "Köszönjük, hogy feliratkozott az OpenERP felfedező napra"
#. module: marketing_campaign_crm_demo
#: model:email.template,subject:marketing_campaign_crm_demo.email_template_7
msgid "Propose gold partnership to silver partners"
-msgstr ""
+msgstr "Javasolja az arany partner tagságot az ezüst tagoknak"
#. module: marketing_campaign_crm_demo
#: model:email.template,subject:marketing_campaign_crm_demo.email_template_6
msgid "Propose paid training to Silver partners"
-msgstr ""
+msgstr "Javasolja a költségtérítéses oktatást az Ezüst partnereknek"
#. module: marketing_campaign_crm_demo
#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_4
@@ -139,6 +174,12 @@ msgid ""
" If any further information required kindly revert back.\n"
"
Regards,OpenERP Team,
"
msgstr ""
+"
Hello,
\n"
+"
Köszönjük az OpenERP könyv utáni érdeklődését és a "
+"vásárlását.
\n"
+" Ha további információra van szüksége kérjük forduljon hozzánk "
+"bizalommal.\n"
+"
Tisztelettel,OpenERP csapata,
"
#. module: marketing_campaign_crm_demo
#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_7
@@ -150,11 +191,17 @@ msgid ""
"reply to this message.\n"
"
Regards,OpenERP Team,
"
msgstr ""
+"
Hello,
\n"
+"
Nagyon jó ajánlatunk van ami illeszkedhet az Ön igényeihez.\n"
+" Az Ezüst partnereinknek, Arany tagságot ajánlunk.
\n"
+"
Ha további információra van szükségük, kérjük válaszoljon "
+"erre az üzenetre.
\n"
+"
Tisztelettel,OpenERP csapata,
"
#. module: marketing_campaign_crm_demo
#: model:email.template,subject:marketing_campaign_crm_demo.email_template_5
msgid "Propose a free technical training to Gold partners"
-msgstr ""
+msgstr "Ajánljon ingyenes műszaki oktatást az Arany partnereknek"
#. module: marketing_campaign_crm_demo
#: model:email.template,body_html:marketing_campaign_crm_demo.email_template_1
@@ -166,3 +213,8 @@ msgid ""
"reply to this message.\n"
"
Regards,OpenERP Team,
"
msgstr ""
+"
Hello,
\n"
+"
Köszönjük az OpenERP iránti őszinte érdeklődését.
\n"
+"
Ha további információra van szükségük, kérjük válaszoljon "
+"erre az üzenetre.
\n"
+"
Tisztelettel,OpenERP csapata,
"
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index edf01290398..299d1494fa6 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -102,7 +102,7 @@ class procurement_order(osv.osv):
readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
" a make to order method."),
'note': fields.text('Note'),
- 'message': fields.char('Latest error', help="Exception occurred while computing procurement orders."),
+ 'message': fields.text('Latest error', help="Exception occurred while computing procurement orders."),
'state': fields.selection([
('draft','Draft'),
('cancel','Cancelled'),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 4169318e9f6..df12a75a567 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -875,7 +875,7 @@ class sale_order_line(osv.osv):
date_order = time.strftime(DEFAULT_SERVER_DATE_FORMAT)
result = {}
- warning_msgs = {}
+ warning_msgs = ''
product_obj = product_obj.browse(cr, uid, product, context=context_partner)
uom2 = False
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 277b4497ffc..62883840f2d 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -21,6 +21,7 @@
import base64
import urllib2
+from urlparse import urlparse, urlunparse
import openerp
from openerp.osv import fields, osv
@@ -30,11 +31,12 @@ class Binary(openerp.addons.web.http.Controller):
@openerp.addons.web.http.jsonrequest
def url2binary(self, req, url):
- if not url.startswith("http"):
- raise Exception("Not allowed to load a file using this protocol")
- if url.count("?") > 0 or url.count("&") > 0 or url.count("=") > 0:
- raise Exception("Not allowed to use GET parameters")
+ """Used exclusively to load images from LinkedIn profiles, must not be used for anything else."""
req.session.assert_valid(force=True)
+ _scheme, _netloc, path, params, query, fragment = urlparse(url)
+ # media.linkedin.com is the master domain for LinkedIn media (replicated to CDNs),
+ # so forcing it should always work and prevents abusing this method to load arbitrary URLs
+ url = urlunparse(('http', 'media.linkedin.com', path, params, query, fragment))
bfile = urllib2.urlopen(url)
return base64.b64encode(bfile.read())