[MERGE] forward port of branch saas-3 up to b15461b
This commit is contained in:
commit
9654b54d3c
|
@ -589,7 +589,8 @@ class account_move_line(osv.osv):
|
||||||
res = super(account_move_line, self)._auto_init(cr, context=context)
|
res = super(account_move_line, self)._auto_init(cr, context=context)
|
||||||
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
|
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
|
||||||
if not cr.fetchone():
|
if not cr.fetchone():
|
||||||
cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
|
cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index '
|
||||||
|
'ON account_move_line (journal_id, period_id, state, create_uid, id DESC)')
|
||||||
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('account_move_line_date_id_index',))
|
cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('account_move_line_date_id_index',))
|
||||||
if not cr.fetchone():
|
if not cr.fetchone():
|
||||||
cr.execute('CREATE INDEX account_move_line_date_id_index ON account_move_line (date DESC, id desc)')
|
cr.execute('CREATE INDEX account_move_line_date_id_index ON account_move_line (date DESC, id desc)')
|
||||||
|
|
|
@ -24,8 +24,8 @@ from openerp.osv import fields, osv
|
||||||
class account_invoice(osv.osv):
|
class account_invoice(osv.osv):
|
||||||
|
|
||||||
_inherit = 'account.invoice'
|
_inherit = 'account.invoice'
|
||||||
def action_number(self, cr, uid, ids, *args):
|
def action_number(self, cr, uid, ids, *args, **kargs):
|
||||||
result = super(account_invoice, self).action_number(cr, uid, ids, *args)
|
result = super(account_invoice, self).action_number(cr, uid, ids, *args, **kargs)
|
||||||
for inv in self.browse(cr, uid, ids):
|
for inv in self.browse(cr, uid, ids):
|
||||||
self.pool.get('account.invoice.line').asset_create(cr, uid, inv.invoice_line)
|
self.pool.get('account.invoice.line').asset_create(cr, uid, inv.invoice_line)
|
||||||
return result
|
return result
|
||||||
|
|
|
@ -46,6 +46,20 @@ class res_users(osv.Model):
|
||||||
validation.update(data)
|
validation.update(data)
|
||||||
return validation
|
return validation
|
||||||
|
|
||||||
|
def _generate_signup_values(self, cr, uid, provider, validation, params, context=None):
|
||||||
|
oauth_uid = validation['user_id']
|
||||||
|
email = validation.get('email', 'provider_%s_user_%s' % (provider, oauth_uid))
|
||||||
|
name = validation.get('name', email)
|
||||||
|
return {
|
||||||
|
'name': name,
|
||||||
|
'login': email,
|
||||||
|
'email': email,
|
||||||
|
'oauth_provider_id': provider,
|
||||||
|
'oauth_uid': oauth_uid,
|
||||||
|
'oauth_access_token': params['access_token'],
|
||||||
|
'active': True,
|
||||||
|
}
|
||||||
|
|
||||||
def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
|
def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
|
||||||
""" retrieve and sign in the user corresponding to provider and validated access token
|
""" retrieve and sign in the user corresponding to provider and validated access token
|
||||||
:param provider: oauth provider id (int)
|
:param provider: oauth provider id (int)
|
||||||
|
@ -70,18 +84,7 @@ class res_users(osv.Model):
|
||||||
return None
|
return None
|
||||||
state = simplejson.loads(params['state'])
|
state = simplejson.loads(params['state'])
|
||||||
token = state.get('t')
|
token = state.get('t')
|
||||||
oauth_uid = validation['user_id']
|
values = self._generate_signup_values(cr, uid, provider, validation, params, context=context)
|
||||||
email = validation.get('email', 'provider_%s_user_%s' % (provider, oauth_uid))
|
|
||||||
name = validation.get('name', email)
|
|
||||||
values = {
|
|
||||||
'name': name,
|
|
||||||
'login': email,
|
|
||||||
'email': email,
|
|
||||||
'oauth_provider_id': provider,
|
|
||||||
'oauth_uid': oauth_uid,
|
|
||||||
'oauth_access_token': params['access_token'],
|
|
||||||
'active': True,
|
|
||||||
}
|
|
||||||
try:
|
try:
|
||||||
_, login, _ = self.signup(cr, uid, values, token, context=context)
|
_, login, _ = self.signup(cr, uid, values, token, context=context)
|
||||||
return login
|
return login
|
||||||
|
|
|
@ -521,6 +521,7 @@ ALL_LANGUAGES = {
|
||||||
'id_ID': u'Indonesian / Bahasa Indonesia',
|
'id_ID': u'Indonesian / Bahasa Indonesia',
|
||||||
'it_IT': u'Italian / Italiano',
|
'it_IT': u'Italian / Italiano',
|
||||||
'ja_JP': u'Japanese / 日本語',
|
'ja_JP': u'Japanese / 日本語',
|
||||||
|
'ka_GE': u'Georgian / ქართული ენა',
|
||||||
'kab_DZ': u'Kabyle / Taqbaylit',
|
'kab_DZ': u'Kabyle / Taqbaylit',
|
||||||
'ko_KP': u'Korean (KP) / 한국어 (KP)',
|
'ko_KP': u'Korean (KP) / 한국어 (KP)',
|
||||||
'ko_KR': u'Korean (KR) / 한국어 (KR)',
|
'ko_KR': u'Korean (KR) / 한국어 (KR)',
|
||||||
|
|
Loading…
Reference in New Issue