mirror of
https://github.com/guohuadeng/app-odoo.git
synced 2025-02-23 04:11:36 +02:00
Merge remote-tracking branch 'origin/12.0' into 12.0
This commit is contained in:
@@ -49,7 +49,6 @@
|
|||||||
],
|
],
|
||||||
'images': ['static/description/banner.jpg'],
|
'images': ['static/description/banner.jpg'],
|
||||||
'data': [
|
'data': [
|
||||||
'views/res_partner_category_views.xml',
|
|
||||||
'views/res_partner_views.xml',
|
'views/res_partner_views.xml',
|
||||||
'views/res_currency_views.xml',
|
'views/res_currency_views.xml',
|
||||||
'views/ir_default_views.xml',
|
'views/ir_default_views.xml',
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
<record model="res.partner" id="base.partner_root">
|
<record model="res.partner" id="base.partner_root">
|
||||||
<field name="name">超管</field>
|
<field name="name">超管</field>
|
||||||
<field name="email">oa@sunpop.cn</field>
|
|
||||||
</record>
|
</record>
|
||||||
</data>
|
</data>
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
from . import res_partner
|
from . import res_partner
|
||||||
from . import res_partner_category
|
|
||||||
from . import res_currency
|
from . import res_currency
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
from odoo import api, models, fields, _
|
|
||||||
|
|
||||||
class PartnerCategory(models.Model):
|
|
||||||
_inherit = 'res.partner.category'
|
|
||||||
_order = 'sequence, name'
|
|
||||||
|
|
||||||
sequence = fields.Integer('Sequence', help="Used to order partner category")
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<odoo>
|
|
||||||
<data noupdate="0">
|
|
||||||
<!-- Partner tree视图,用继承方式改写2018-11-21,ivan -->
|
|
||||||
<record id="app_view_partner_category_list" model="ir.ui.view">
|
|
||||||
<field name="name">app Contact Tags</field>
|
|
||||||
<field name="model">res.partner.category</field>
|
|
||||||
<field name="inherit_id" ref="base.view_partner_category_list"/>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//field[@name='display_name']" position="before">
|
|
||||||
<field name="sequence" widget="handle"/>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
</data>
|
|
||||||
</odoo>
|
|
||||||
Reference in New Issue
Block a user