audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

update common add core

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app_base_chinese/data/res_lang_data.xml
View File

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

4
app_base_chinese/models/res_company.py
View File

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

12
app_odoo_customize/models/res_config_settings.py
View File

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

2
app_product_superbar/models/product_category.py
View File

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

4
app_product_ztree/models/product_category.py
View File

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