update common add core

This commit is contained in:
ivan deng
2020-09-16 03:04:26 +08:00
parent 05cd3ec558
commit 6a336710cb
5 changed files with 12 additions and 12 deletions

View File

@@ -4,7 +4,7 @@
<!-- 时间格式 -->
<record id="base.lang_zh_CN" model="res.lang">
<field name="date_format">%Y-%m-%d</field>
<field name="time_format">%H:%M</field>
<field name="time_format">%H:%M:%S</field>
</record>
</data>
</odoo>

View File

@@ -9,9 +9,9 @@ class ResCompany(models.Model):
short_name = fields.Char('Short Name', related='partner_id.short_name', readonly=False)
# 当传参 show_short_name 时,只显示简称
# 当传参 show_short_company 时,只显示简称
def name_get(self):
if self._context.get('show_short_name'):
if self._context.get('show_short_company'):
return [(value.id, "%s" % (value.short_name if value.short_name else value.name)) for value in self]
else:
return super().name_get()

View File

@@ -127,9 +127,9 @@ class ResConfigSettings(models.TransientModel):
sql = "delete from %s" % t_name
try:
self._cr.execute(sql)
self._cr.commit()
except Exception as e:
_logger.error('remove data error: %s,%s', line, e)
self._cr.commit()
# 更新序号
for line in s:
domain = [('code', '=ilike', line + '%')]
@@ -288,15 +288,15 @@ class ResConfigSettings(models.TransientModel):
to_removes = [
# 清除财务会计单据
'payment.transaction',
'account.voucher.line',
'account.voucher',
# 'account.voucher.line',
# 'account.voucher',
# 'account.invoice.line',
# 'account.invoice.refund',
# 'account.invoice',
'account.bank.statement.line',
'account.payment',
'account.analytic.line',
'account.analytic.account',
'account.invoice.line',
'account.invoice.refund',
'account.invoice',
'account.partial.reconcile',
'account.move.line',
'hr.expense.sheet',

View File

@@ -22,7 +22,7 @@ class ProductCategory(models.Model):
# 更新 complete_name 算法当有context: show_short =1 时,只显示短名
def name_get(self):
if self._context.get('show_short'):
if self._context.get('show_short_category'):
new_res = []
for category in self:
name = category.name

View File

@@ -20,9 +20,9 @@ from odoo import api, fields, models, exceptions, _
class ProductCategory(models.Model):
_inherit = 'product.category'
# 更新 complete_name 算法当有context: show_short =1 时,只显示短名
# 更新 complete_name 算法当有context: show_short_category =1 时,只显示短名
def name_get(self):
if self._context.get('show_short'):
if self._context.get('show_short_category'):
new_res = []
for category in self:
name = category.name