Merge branch 'dev' into dev_zhang

yuthon_contract/__manifest__.py

@@ -10,10 +10,12 @@
     'category': 'Human Resources/Attendances',
     'version': '0.1',
     'license': 'LGPL-3',
-    'depends': ['mail', 'hr_contract', 'sale_renting'],
+    'depends': ['hr_contract', 'sale_renting'],
     'data': [
         'security/ir.model.access.csv',
         'views/contract_menu_views.xml',
+        'views/inherit_hr_contract_views.xml',
+        'views/inherit_sale_order_views.xml',
 
     ],
     'installable': True,

yuthon_contract/models/__init__.py

@@ -0,0 +1,2 @@
+from . import inherit_hr_contract
+from . import inherit_sale_order

yuthon_contract/models/inherit_hr_contract.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools
+from odoo.exceptions import ValidationError
+
+
+class HrContract(models.Model):
+    _inherit = "hr.contract"
+    _description = "员工合同拓展"
+

yuthon_contract/models/inherit_sale_order.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, tools
+from odoo.exceptions import ValidationError
+
+
+class SaleOrder(models.Model):
+    _inherit = "sale.order"
+    _description = "租赁合同拓展"
+

yuthon_contract/views/inherit_hr_contract_views.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="inherit_hr_contract_yuthon_tree" model="ir.ui.view">
+        <field name="name">inherit.hr.contract.yuthon.tree</field>
+        <field name="model">hr.contract</field>
+        <field name="inherit_id" ref="hr_contract.hr_contract_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="" postion="">
+
+            </xpath>
+        </field>
+    </record>
+    <record id="inherit_hr_contract_yuthon_form" model="ir.ui.view">
+        <field name="name">inherit.hr.contract.yuthon.form</field>
+        <field name="model">hr.contract</field>
+        <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="" postion="">
+
+            </xpath>
+        </field>
+    </record>
+</odoo>

yuthon_contract/views/inherit_sale_order_views.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="inherit_sale_renting_yuthon_tree" model="ir.ui.view">
+        <field name="name">inherit.sale.renting.yuthon.tree</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale_renting.rental_order_view_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="" postion="">
+                
+            </xpath>
+        </field>
+    </record>
+    <record id="inherit_sale_renting_yuthon_form" model="ir.ui.view">
+        <field name="name">inherit.sale.renting.yuthon.form</field>
+        <field name="model">sale.order</field>
+        <field name="inherit_id" ref="sale_renting.rental_order_primary_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="" postion="">
+                
+            </xpath>
+        </field>
+    </record>
+</odoo>