diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml index 1cad1886a..28a44f6ed 100644 --- a/yuthon_maintain/views/property_report_repair.xml +++ b/yuthon_maintain/views/property_report_repair.xml @@ -25,6 +25,7 @@ + diff --git a/yuthon_property_approval/views/property_business_confirm.xml b/yuthon_property_approval/views/property_business_confirm.xml index 9e5aa711e..7c9ca69e6 100644 --- a/yuthon_property_approval/views/property_business_confirm.xml +++ b/yuthon_property_approval/views/property_business_confirm.xml @@ -26,9 +26,11 @@ + + diff --git a/yuthon_purchase/models/purchase_low_orders.py b/yuthon_purchase/models/purchase_low_orders.py index 77bf1ea2c..28aeebb82 100644 --- a/yuthon_purchase/models/purchase_low_orders.py +++ b/yuthon_purchase/models/purchase_low_orders.py @@ -5,7 +5,7 @@ from odoo import api, fields, models class PurchaseLowOrders(models.Model): _name = 'purchase.low.orders' _description = '低值易耗采购单' - _inherit = ['soong.workflow.mixin', 'mail.thread', 'mail.activity.mixin'] + _inherit = ['soong.workflow.mixin'] name = fields.Char(string="标题") code = fields.Char(string="合同编号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_low_orders_code')) diff --git a/yuthon_purchase/models/purchase_service_orders.py b/yuthon_purchase/models/purchase_service_orders.py index b265269ad..82c6ab052 100644 --- a/yuthon_purchase/models/purchase_service_orders.py +++ b/yuthon_purchase/models/purchase_service_orders.py @@ -5,7 +5,7 @@ from odoo import api, fields, models class PurchaseServiceOrders(models.Model): _name = 'purchase.service.orders' _description = '服务采购单' - _inherit = ['soong.workflow.mixin', 'mail.thread', 'mail.activity.mixin'] + _inherit = ['soong.workflow.mixin'] name = fields.Char(string="标题") code = fields.Char(string="合同编号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_service_orders_code')) @@ -21,7 +21,7 @@ class PurchaseServiceOrders(models.Model): partyB = fields.Many2one('res.partner', string="乙方") license_id = fields.Many2one('ir.attachment', string='营业执照') aptitude_id = fields.Many2one('ir.attachment', string='资质') - contract_id = fields.Many2one('ir.attachment', string='合同') + contract_id = fields.Many2one('ir.attachment', string='合同') other_id = fields.Many2one('ir.attachment', string='其他') pay_way = fields.Selection([('staging', '分期'), ('full', '一次性')], string='付款方式', default='full') total = fields.Float(string="合计") diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml index 3aad4f120..5a3c784a8 100644 --- a/yuthon_trade/views/yuthon_business_approval_viwes.xml +++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml @@ -45,7 +45,7 @@ - d +