[MERGE] forward port of branch 7.0 up to 1d01872

This commit is contained in:
Christophe Simonis 2015-07-10 16:30:48 +02:00
commit b15461baba
6 changed files with 68 additions and 29 deletions

View File

@ -574,7 +574,8 @@ class account_move_line(osv.osv):
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\'')
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',))
if not cr.fetchone():
cr.execute('CREATE INDEX account_move_line_date_id_index ON account_move_line (date DESC, id desc)')

View File

@ -24,8 +24,8 @@ from openerp.osv import fields, osv
class account_invoice(osv.osv):
_inherit = 'account.invoice'
def action_number(self, cr, uid, ids, *args):
result = super(account_invoice, self).action_number(cr, uid, ids, *args)
def action_number(self, cr, uid, ids, *args, **kargs):
result = super(account_invoice, self).action_number(cr, uid, ids, *args, **kargs)
for inv in self.browse(cr, uid, ids):
self.pool.get('account.invoice.line').asset_create(cr, uid, inv.invoice_line)
return result

View File

@ -31,6 +31,20 @@ _logger = logging.getLogger(__name__)
class res_users(osv.Model):
_inherit = 'res.users'
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):
# overridden to use signup method if regular oauth signin fails
try:
@ -41,18 +55,7 @@ class res_users(osv.Model):
return None
state = simplejson.loads(params['state'])
token = state.get('t')
oauth_uid = validation['user_id']
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,
}
values = self._generate_signup_values(cr, uid, provider, validation, params, context=context)
try:
_, login, _ = self.signup(cr, uid, values, token, context=context)
except SignupError:

View File

@ -148,8 +148,8 @@
<field name="ref_base_sign" eval="-1.0"/>
<field name="ref_tax_sign" eval="-1.0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="account_collected_id" ref="ch_1170"/>
<field name="account_paid_id" ref="ch_1170"/>
<field name="account_collected_id" ref="ch_2200"/>
<field name="account_paid_id" ref="ch_2200"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="vat_25_purchase">
@ -169,8 +169,8 @@
<field name="ref_tax_sign" eval="1.0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="account_collected_id" ref="ch_1171"/>
<field name="account_paid_id" ref="ch_1171"/>
<field name="account_collected_id" ref="ch_1170"/>
<field name="account_paid_id" ref="ch_1170"/>
</record>
<record model="account.tax.template" id="vat_25_invest">
<field name="name">TVA 2.5% sur invest. et autres ch. (TR)</field>
@ -210,8 +210,8 @@
<field name="ref_tax_sign" eval="-1.0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="ch_1170"/>
<field name="account_paid_id" ref="ch_1170"/>
<field name="account_collected_id" ref="ch_2200"/>
<field name="account_paid_id" ref="ch_2200"/>
</record>
<record model="account.tax.template" id="vat_38_purchase">
<field name="name">TVA 3.8% sur achat B&amp;S (TS)</field>
@ -230,8 +230,8 @@
<field name="ref_tax_sign" eval="1.0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="account_collected_id" ref="ch_1171"/>
<field name="account_paid_id" ref="ch_1171"/>
<field name="account_collected_id" ref="ch_1170"/>
<field name="account_paid_id" ref="ch_1170"/>
</record>
<record model="account.tax.template" id="vat_38_invest">
<field name="name">TVA 3.8% sur invest. et autres ch. (TS)</field>
@ -271,8 +271,8 @@
<field name="ref_tax_sign" eval="-1.0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="ch_1170"/>
<field name="account_paid_id" ref="ch_1170"/>
<field name="account_collected_id" ref="ch_2200"/>
<field name="account_paid_id" ref="ch_2200"/>
</record>
<record model="account.tax.template" id="vat_80_purchase">
<field name="name">TVA 8.0% sur achat B&amp;S (TN)</field>
@ -292,8 +292,8 @@
<field name="ref_tax_sign" eval="1.0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="account_collected_id" ref="ch_1171"/>
<field name="account_paid_id" ref="ch_1171"/>
<field name="account_collected_id" ref="ch_1170"/>
<field name="account_paid_id" ref="ch_1170"/>
</record>
<record model="account.tax.template" id="vat_80_invest">
<field name="name">TVA 8.0% sur invest. et autres ch. (TN)</field>
@ -330,8 +330,8 @@
<field name="ref_tax_sign" eval="-1.0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="ch_1170"/>
<field name="account_paid_id" ref="ch_1170"/>
<field name="account_collected_id" ref="ch_2200"/>
<field name="account_paid_id" ref="ch_2200"/>
</record>
<record model="account.tax.template" id="vat_O_exclude">
<field name="name">TVA 0% exclue</field>

View File

@ -377,6 +377,40 @@ class mrp_bom(osv.osv):
res = self._bom_explode(cr, uid, bom2, factor, properties, addthis=True, level=level+10)
result = result + res[0]
result2 = result2 + res[1]
# We merge the results for the same product. The reason is that action_produce does not
# support the case where the same product appears on multiple lines. To avoid major changes
# in a stable version, we do this simple hack at this point.
# Only for v7.0, do not use in v8.0
result_dict = {}
result_dup = False
for product_detail in result:
key = (
product_detail['name'],
product_detail['product_id'],
product_detail['product_uom'],
product_detail['product_uos_qty'],
product_detail['product_uos']
)
if key in result_dict:
result_dict[key] += product_detail['product_qty']
result_dup = True
else:
result_dict[key] = product_detail['product_qty']
if result_dup:
result = []
for key in result_dict.keys():
result.append(
{
'name': key[0],
'product_id': key[1],
'product_qty': result_dict[key],
'product_uom': key[2],
'product_uos_qty': key[3],
'product_uos': key[4],
})
return result, result2
def copy_data(self, cr, uid, id, default=None, context=None):

View File

@ -465,6 +465,7 @@ ALL_LANGUAGES = {
'id_ID': u'Indonesian / Bahasa Indonesia',
'it_IT': u'Italian / Italiano',
'ja_JP': u'Japanese / 日本語',
'ka_GE': u'Georgian / ქართული ენა',
'ko_KP': u'Korean (KP) / 한국어 (KP)',
'ko_KR': u'Korean (KR) / 한국어 (KR)',
'lo_LA': u'Lao / ພາສາລາວ',