!11726 是否用章

Merge pull request !11726 from 李鹏宇/dev_wang

yuthon_issue/models/issue_library.py

@@ -141,18 +141,11 @@ class IssueLibrary(models.Model):
         records = self.env['issue.library'].browse(active_ids)
         count = 0
         for record in records:
-            if record.class_char:
-                # 先清理HTML标签
-                value = record.class_char
-                value = re.sub(r'<[^>]+>', '', value)
-                # 再补"次"字
-                if '班子会' in value and '第' in value:
-                    pattern = r'(第\d+)(班子会)'
-                    new_value = re.sub(pattern, r'\1次\2', value)
-                else:
-                    new_value = value
-                if new_value != record.class_char:
-                    record.class_char = new_value
+            # 只清理party_char的HTML标签
+            if record.party_char:
+                clean_value = re.sub(r'<[^>]+>', '', record.party_char)
+                if clean_value != record.party_char:
+                    record.party_char = clean_value
                     count += 1
         return {
             'type': 'ir.actions.client',

yuthon_issue/views/issue_library_views.xml

@@ -57,6 +57,7 @@
                   decoration-muted="issue_state == 'cancel'">
                 <header>
                    <button name="all_meeting_issue" type="object" string="会议安排" class="oe_highlight" groups="yuthon_salary.group_lc_user"/>
+                   <button name="batch_add_ci_char" type="object" string="批量补'次'字" class="oe_highlight"/>
                 </header>
                 <field name="code"/>
                 <field name="name" column_invisible="1"/>

yuthon_property_approval/models/property_open_rent.py

@@ -22,6 +22,7 @@ class PropertyOpenRent(models.Model):
     document_ids = fields.Many2many('ir.attachment', string="附件")
     handling_opinions = fields.Text(string="经办意见")
     type_stamp_ids = fields.Many2many('seals.type.setting', string='用章类型')
+    is_chapter = fields.Selection([('yes', '是'), ('no', '否')], string='是否用章', default='no')
 
     # 物业
     property_name = fields.Char(string="物业信息")

yuthon_property_approval/views/property_open_rent_views.xml

@@ -41,7 +41,8 @@
                             <field name="upset" invisible="1"/>
                             <field name="property_name" readonly="1"/>
                             <field name="handling_opinions"/>
-                            <field name="type_stamp_ids" widget="many2many_tags" options="{'no_create': True, 'no_open': True}}"/>
+                            <field name="is_chapter" string="是否用章"/>
+                            <field name="type_stamp_ids" widget="many2many_tags" string="用章类型" options="{'no_create': True, 'no_open': True}" required="is_chapter" invisible="is_chapter != 'yes'"/>
                         </group>
                     </group>
                     <group>