diff --git a/room/models/room_booking.py b/room/models/room_booking.py
index f2216a1b3..04dd62544 100644
--- a/room/models/room_booking.py
+++ b/room/models/room_booking.py
@@ -55,7 +55,7 @@ class RoomBooking(models.Model):
})
# 企业用户发送通知
partner_ids = self.sudo().env['res.users'].search([('id', 'in', self.room_users_ids.ids)]).mapped('partner_id').ids
- self.sudo().with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids,'room.message_yuthon_room_users_data')
+ self.sudo().with_context(lang=self.env.lang)._message_auto_subscribe_notify(partner_ids, 'room.message_yuthon_room_users_data')
# odoo发通知
def meeting_sign_in(self):
pass
diff --git a/yuthon_contract/models/inherit_hr_contract.py b/yuthon_contract/models/inherit_hr_contract.py
index 9eaa7fb41..2d5066b9f 100644
--- a/yuthon_contract/models/inherit_hr_contract.py
+++ b/yuthon_contract/models/inherit_hr_contract.py
@@ -7,12 +7,6 @@ class HrContract(models.Model):
_inherit = "hr.contract"
_description = "员工合同拓展"
- first_party = fields.Selection([('thtz','天河投资'),
- ('thcj','天河城建'),
- ('thwg','天河物管'),
- ('thlc','天河粮储存')],
- string='甲方')
- party_b = fields.Char("乙方")
account = fields.Char("账户")
bank = fields.Char("开户行")
diff --git a/yuthon_contract/models/inherit_res_partner.py b/yuthon_contract/models/inherit_res_partner.py
index 873692daa..2e701c16d 100644
--- a/yuthon_contract/models/inherit_res_partner.py
+++ b/yuthon_contract/models/inherit_res_partner.py
@@ -2,7 +2,8 @@
from odoo import api, fields, models, tools
from odoo.exceptions import ValidationError
-class InheritSaleOrder(models.Model):
+
+class ResPartner(models.Model):
_inherit = 'res.partner'
_description = "联系人拓展"
diff --git a/yuthon_contract/models/inherit_sale_order.py b/yuthon_contract/models/inherit_sale_order.py
index be8274122..f8749f66e 100644
--- a/yuthon_contract/models/inherit_sale_order.py
+++ b/yuthon_contract/models/inherit_sale_order.py
@@ -2,28 +2,16 @@
from odoo import api, fields, models, tools
from odoo.exceptions import ValidationError
+
class SaleOrder(models.Model):
_inherit = "sale.order"
_description = "租赁合同拓展"
- contract_id = fields.Char(string="合同编号", default=lambda self: self.env['ir.sequence'].next_by_code('sale_order_code'))
- res_partner_ids = fields.One2many('res.partner', 'sale_order_id', string='关联联系人')
- sale_order_details_ids = fields.One2many('sale.order.details', 'sale_order_id', string='承租方明细')
+ contract_code = fields.Char(string="合同编号", default=lambda self: self.env['ir.sequence'].next_by_code('sale_order_code'))
+ res_partner_ids = fields.One2many('res.partner', 'sale_order_id', string='承租方明细')
contract_documents_ids = fields.Many2many('documents.document', string="附件")
contract_confirm_date = fields.Datetime(string="合同签定日期")
handover_date = fields.Datetime(string="交接日期")
-class SaleOrderDetails(models.Model):
- _name = "sale.order.details"
- _description = "承租方明细"
-
- sale_order_id = fields.Many2one("sale.order", string='关联租赁合同')
- unit_price = fields.Float(string='单价')
- monthly_rent = fields.Float(string='月租金')
- period_one = fields.Char(string='期间1')
- period_two = fields.Char(string='期间2')
- period_months = fields.Char(string='期间月数')
- period_rent = fields.Float(string='期间租金')
-
diff --git a/yuthon_contract/views/inherit_hr_contract_views.xml b/yuthon_contract/views/inherit_hr_contract_views.xml
index c52d6c8e3..786954743 100644
--- a/yuthon_contract/views/inherit_hr_contract_views.xml
+++ b/yuthon_contract/views/inherit_hr_contract_views.xml
@@ -5,14 +5,6 @@
hr.contract
-
-
-
-
-
-
-
-
diff --git a/yuthon_contract/views/inherit_sale_order_views.xml b/yuthon_contract/views/inherit_sale_order_views.xml
index 95191b850..036584626 100644
--- a/yuthon_contract/views/inherit_sale_order_views.xml
+++ b/yuthon_contract/views/inherit_sale_order_views.xml
@@ -6,7 +6,7 @@
-
+
@@ -31,18 +31,6 @@
-
-
-
-
-
-
-
-
-
-
-
-