更新ribbon样式,更新 mrp_pro

This commit is contained in:
ivan deng
2020-07-20 12:57:24 +08:00
parent f328fa503d
commit 24df5863cb
6 changed files with 77 additions and 7 deletions

View File

@@ -83,6 +83,7 @@
'css': [
],
'qweb': [
'static/src/xml/*.xml',
],
'js': [
],

View File

@@ -0,0 +1,17 @@
# -*- coding: utf-8 -*-
from odoo import api, models, fields, _
from odoo.exceptions import UserError, ValidationError
class ResCompany(models.Model):
_inherit = 'res.company'
short_name = fields.Char('Short Name', related='partner_id.short_name', readonly=False, store=True)
# 当传参 show_short_name 时,只显示简称
def name_get(self):
if self._context.get('show_short_name'):
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

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates id="template" xml:space="preserve">
<!--改search中英文-->
<t t-extend="SearchPanel.Category">
<t t-jquery="div.alert" t-operation="replace">
<div t-if="category.limitAttained" class="alert alert-warning">
<span>性能原因,只支持 200 条记录的显示</span>
<span t-if="category.parentField">记录没有树状结构</span>
</div>
</t>
</t>
</templates>

View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="app_view_company_tree" model="ir.ui.view">
<field name="name">app.res.company.form</field>
<field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_tree"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='name']" position="after">
<field name="short_name"/>
</xpath>
</field>
</record>
<record id="app_view_company_form" model="ir.ui.view">
<field name="name">app.res.company.form</field>
<field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='phone']" position="before">
<field name='short_name'/>
</xpath>
</field>
</record>
</data>
</odoo>

View File

@@ -5,21 +5,21 @@
.test-ribbon {
width: 300px;
top: 25px;
left: -100px;
right: -100px;
text-align: center;
padding: 10px;
line-height: 20px;
letter-spacing: 1px;
color: #f0f0f0;
-webkit-transform: rotate(-45deg);
-ms-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-o-transform: rotate(-45deg);
transform: rotate(-45deg);
-webkit-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
z-index: 9999;
position: fixed;
box-shadow: 0 0 3px rgba(0, 0, 0, 0.3);
background: rgba(255, 0, 0, 0.6);
background: rgba(255, 0, 0, 0.5);
pointer-events: none;
}

View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="app_view_view_tree" model="ir.ui.view">
<field name="name">app.ir.ui.view tree</field>
<field name="model">ir.ui.view</field>
<field name="inherit_id" ref="base.view_view_tree"/>
<field name="arch" type="xml">
<field name="model" position="after">
<field name="priority"/>
<field name="mode"/>
</field>
</field>
</record>
</odoo>