!4333 1

Merge pull request !4333 from 李鹏宇/dev

yuthon_maintain/views/property_report_repair.xml

@@ -25,6 +25,7 @@
                     <group col="3">
                         <group>
                             <field name="code" string="保修编号" readonly="1"/>
+                            <field name="work_end" invisible="1"/>
                         </group>
                         <group>
                             <field name="urgency_level" readonly="1"/>

yuthon_property_approval/views/property_business_confirm.xml

@@ -26,9 +26,11 @@
                     <group>
                         <group>
                             <field name="code"/>
+                            <field name="work_end" invisible="1"/>
                             <field name="property_documents_ids">
                                 <tree>
                                     <field name="name"/>
+
                                 </tree>
                             </field>
                         </group>

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'))

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="合计")

yuthon_trade/views/yuthon_business_approval_viwes.xml

@@ -45,7 +45,7 @@
                         <field name="name"/>
                         <field name="users_id"/>
                         <field name="reason"/>
-                        <field name="document_ids" widget="preview_many2many"/>d
+                        <field name="document_ids" widget="preview_many2many"/>
                         <field name="department_id" invisible="1"/>
                     </group>
                 </sheet>