diff --git a/yuthon_hr_attendance/models/card_approval.py b/yuthon_hr_attendance/models/card_approval.py
index 0d7295ff2..6ed19b68f 100644
--- a/yuthon_hr_attendance/models/card_approval.py
+++ b/yuthon_hr_attendance/models/card_approval.py
@@ -40,6 +40,12 @@ class CardApprovals(models.Model):
                 rep.replacement_time = 'all'
             if rep.attendance_id.is_early_card and rep.attendance_id.is_no_card:
                 rep.replacement_time = 'all'
+            if rep.attendance_id.is_no_card and not rep.attendance_id.check_out:
+                rep.replacement_time = 'quitting'
+            if rep.attendance_id.is_no_card and not rep.attendance_id.check_in:
+                rep.replacement_time = 'work'
+            if rep.attendance_id.is_no_card and not rep.attendance_id.check_in and not rep.attendance_id.check_out:
+                rep.replacement_time = 'all'
 
     @api.depends('users_id', 'attendance_id')
     def _compute_name(self):
@@ -92,6 +98,3 @@ class CardApprovals(models.Model):
         elif self.related_issues_id:
             raise UserError("已经创建了相关的上会记录，不能取消勾选")
 
-
-
-
diff --git a/yuthon_hr_attendance/security/planning_group.xml b/yuthon_hr_attendance/security/planning_group.xml
index 255733526..ea139f154 100644
--- a/yuthon_hr_attendance/security/planning_group.xml
+++ b/yuthon_hr_attendance/security/planning_group.xml
@@ -31,7 +31,6 @@
             <field name="users" eval="[(4, ref('base.user_admin'))]"/>
         </record>
 
-
         <record id="group_he_attendance_engineering_user" model="res.groups">
             <field name="name">工程部：用户</field>
             <field name="category_id" ref="module_he_attendance_duty"/>
@@ -76,7 +75,6 @@
             (4, ref('group_he_attendance_run_manager'))]"/>
             <field name="users" eval="[(4, ref('base.user_admin'))]"/>
         </record>
-
         <record id="group_he_attendance_lc_user" model="res.groups">
             <field name="name">粮储:用户</field>
             <field name="category_id" ref="module_he_attendance_duty"/>
@@ -97,13 +95,13 @@
             <field name="implied_ids" eval="[(4, ref('group_he_attendance_customer_user'))]"/>
             <field name="users" eval="[(4, ref('base.user_admin'))]"/>
         </record>
-
          <record id="group_he_attendance_planning_manager" model="res.groups">
-            <field name="name">计划考勤管理员</field>
+                    <field name="name">计划考勤管理员</field>
             <field name="category_id" ref="module_he_attendance_duty"/>
             <field name="implied_ids" eval="[(4, ref('group_he_attendance_customer_manager')), (4, ref('group_he_attendance_engineering_manager')),
             (4, ref('group_he_attendance_security_manager'))]"/>
             <field name="users" eval="[(4, ref('base.user_admin'))]"/>
         </record>
+
     </data>
 </odoo>
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index 5243ce549..e4519a3f6 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -36,7 +36,7 @@
                 <field name="check_in" optional="show" widget="time"/>
                 <field name="check_out" optional="show" widget="time"/>
                 <field name="create_date" optional="hidden"/>
-                <field name="current_data" optional="hidden"/>
+                <field name="current_data" optional="show"/>
                 <field name="week" optional="show"/>
                 <field name="abnormal" optional="show" column_invisible="1"/>
                 <field name="work_time_type" optional="hidden"/>
diff --git a/yuthon_property/data/data_yuthon_resource_mgmt_config.xml b/yuthon_property/data/data_yuthon_resource_mgmt_config.xml
index 6c8def2e6..1b013b99d 100644
--- a/yuthon_property/data/data_yuthon_resource_mgmt_config.xml
+++ b/yuthon_property/data/data_yuthon_resource_mgmt_config.xml
@@ -69,7 +69,7 @@
         <field name="name">代管</field>
     </record>
     <record model="yuthon.resource.management.type" id="yuthon_resource_management_type_data1">
-        <field name="name">自营</field>
+        <field name="name">自有</field>
     </record>
 
     <record model="yuthon.resource.billing.type" id="yuthon_resource_billing_type_data0">
diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml
index 5c8ccd831..f327cd9b2 100644
--- a/yuthon_property/views/menuitem.xml
+++ b/yuthon_property/views/menuitem.xml
@@ -79,6 +79,36 @@
               sequence="9"
               name="租赁合同"
               parent="yuthon_property_menu_root"/>
+    <menuitem id="yuthon_property_fee_management"
+              sequence="4"
+              name="应收"
+              parent="yuthon_property_estate_menu"/>
+    <menuitem id="yuthon_property_rent_list"
+              sequence="20"
+              name="租金列表"
+              parent="yuthon_property_fee_management"
+              action="view_property_rent_list_action"/>
+    <menuitem id="yuthon_property_management_list"
+              sequence="23"
+              name="管理费列表"
+              parent="yuthon_property_fee_management"
+              action="view_property_management_list_action"/>
+    <menuitem id="yuthon_property_penalty_list"
+              sequence="25"
+              name="违约金列表"
+              parent="yuthon_property_fee_management"
+              action="view_property_penalty_list_action"/>
+    <menuitem id="yuthon_property_water_list"
+              sequence="28"
+              name="水费列表"
+              parent="yuthon_property_fee_management"
+              action="view_property_water_list_action"/>
+    <menuitem id="yuthon_property_tariff_list"
+              sequence="32"
+              name="电费列表"
+              parent="yuthon_property_fee_management"
+              action="view_property_tariff_list_action"/>
+
     <menuitem id="yuthon_property_estate_works_menu"
               sequence="5"
               name="建设工程"
@@ -152,36 +182,6 @@
               sequence="17"
               name="财务管理"
               parent="yuthon_property_menu_root"/>
-    <menuitem id="yuthon_property_fee_management"
-              sequence="1"
-              name="应收"
-              parent="yuthon_financial_management_menu"
-              action="property_assess_action"/>
-    <menuitem id="yuthon_property_rent_list"
-              sequence="20"
-              name="租金列表"
-              parent="yuthon_property_fee_management"
-              action="view_property_rent_list_action"/>
-    <menuitem id="yuthon_property_management_list"
-              sequence="23"
-              name="管理费列表"
-              parent="yuthon_property_fee_management"
-              action="view_property_management_list_action"/>
-    <menuitem id="yuthon_property_penalty_list"
-              sequence="25"
-              name="违约金列表"
-              parent="yuthon_property_fee_management"
-              action="view_property_penalty_list_action"/>
-    <menuitem id="yuthon_property_water_list"
-              sequence="28"
-              name="水费列表"
-              parent="yuthon_property_fee_management"
-              action="view_property_water_list_action"/>
-    <menuitem id="yuthon_property_tariff_list"
-              sequence="32"
-              name="电费列表"
-              parent="yuthon_property_fee_management"
-              action="view_property_tariff_list_action"/>
     <menuitem id="yuthon_property_other_list"
               sequence="3"
               name="应付"
@@ -336,8 +336,8 @@
 
     <menuitem id="yuthon_rental_purpose_menu" parent="resource_mgmt_config_menu" name="出租用途"
               action="yuthon_rental_purpose_action" sequence="32"/>
-    <menuitem id="yuthon_resource_management_type_menu" parent="resource_mgmt_config_menu" name="权属类型"
-              action="yuthon_resource_management_type_action" sequence="10"/>
+<!--    <menuitem id="yuthon_resource_management_type_menu" parent="resource_mgmt_config_menu" name="权属类型"-->
+<!--              action="yuthon_resource_management_type_action" sequence="10"/>-->
     <menuitem id="yuthon_resource_mgmt_config_menu" parent="resource_mgmt_config_menu" name="开票类型"
               action="yuthon_resource_mgmt_config_action" sequence="11"/>
     <menuitem id="yuthon_property_source_action_menu" parent="resource_mgmt_config_menu" name="物业来源"
diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index b4323ad52..6acda06f9 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -94,6 +94,7 @@ class PropertyLeaseContract(models.Model):
     is_split = fields.Boolean(string="是否合同拆分")
     split_context = fields.Char(string="拆分内容", default="该合同已拆分")
     percentage_liquidated_damages = fields.Many2one('yuthon.penalty.setting', string="违约金比例")
+    percentage_damages= fields.Float(string="违约金")
     date_payment_month = fields.Char(string="支付日期")
     date_payment_day = fields.Char(string="支付日期")
     first_pay = fields.Date(string="首次付款日")
@@ -819,6 +820,12 @@ class PropertyLeaseContract(models.Model):
             else:
                 record.progress_percentage = 0
 
+    @api.onchange("name")
+    def _onchange_name(self):
+        if self.name:
+            self.address_for_delivery = self.name
+            self.use_address = self.name
+
 class PropertyLeaseContractLine(models.Model):
     _name = 'property.lease.contract.line'
     _description = '物业列表明细行'
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 2d1e986e4..7fd68ca39 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -88,62 +88,6 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="租金明细">
-                            <!--                            <button name="action_generate_details" class="oe_link btn btn-primary" type="object"-->
-                            <!--                                    string="生成明细"/>-->
-                            <field name="breakdown_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="breakdown_id" column_invisible="1"/>
-                                    <!--                                    <field name="charges"/>-->
-                                    <field name="unit_price"/>
-                                    <field name="monthly_amount"/>
-                                    <field name="start_data"/>
-                                    <field name="end_data"/>
-                                    <field name="month_number"/>
-                                    <field name="period_rent"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="其他费用">
-                            <field name="other_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="other_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="coping"/>
-                                    <field name="coping_time"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="水费" invisible="not is_water">
-                            <field name="water_fee_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="contract_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="fees_id"/>
-                                    <field name="proportional"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="电费" invisible="not is_electricity">
-                            <field name="electricity_fee_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="contract_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="fees_id"/>
-                                    <field name="proportional"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="管理费" invisible="not is_mange">
-                            <field name="mange_fee_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="contract_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="fees_id"/>
-                                    <field name="proportional"/>
-                                </tree>
-                            </field>
-                        </page>
                         <page string="附件">
                             <group col="2">
                                 <group>
@@ -281,6 +225,61 @@
                     <group>
                         <field name="miscellaneous"/>
                     </group>
+                    <notebook>
+                        <page string="租金明细">
+                            <field name="breakdown_ids" string=" ">
+                                <tree editable="bottom">
+                                    <field name="breakdown_id" column_invisible="1"/>
+                                    <field name="unit_price"/>
+                                    <field name="monthly_amount"/>
+                                    <field name="start_data"/>
+                                    <field name="end_data"/>
+                                    <field name="month_number"/>
+                                    <field name="period_rent"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="水费" invisible="not is_water">
+                            <field name="water_fee_ids" string=" ">
+                                <tree editable="bottom">
+                                    <field name="contract_id" column_invisible="1"/>
+                                    <field name="charges"/>
+                                    <field name="fees_id"/>
+                                    <field name="proportional"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="电费" invisible="not is_electricity">
+                            <field name="electricity_fee_ids" string=" ">
+                                <tree editable="bottom">
+                                    <field name="contract_id" column_invisible="1"/>
+                                    <field name="charges"/>
+                                    <field name="fees_id"/>
+                                    <field name="proportional"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="管理费" invisible="not is_mange">
+                            <field name="mange_fee_ids" string=" ">
+                                <tree editable="bottom">
+                                    <field name="contract_id" column_invisible="1"/>
+                                    <field name="charges"/>
+                                    <field name="fees_id"/>
+                                    <field name="proportional"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="其他费用">
+                            <field name="other_ids" string=" ">
+                                <tree editable="bottom">
+                                    <field name="other_id" column_invisible="1"/>
+                                    <field name="charges"/>
+                                    <field name="coping"/>
+                                    <field name="coping_time"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
                 </sheet>
             </form>
         </field>
@@ -297,7 +296,7 @@
                 <field name="total_contract_receivables"/>
                 <field name="actual_receivable"/>
                  <field name="now_receivable"/>
-                <field name="percentage_liquidated_damages"/>
+                <field name="percentage_damages"/>
                 <field name="total_receivable"/>
                 <field name="term_start_time"/>
                 <field name="term_end_time"/>
@@ -375,62 +374,6 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="租金明细">
-                            <!--                            <button name="action_generate_details" class="oe_link btn btn-primary" type="object"-->
-                            <!--                                    string="生成明细"/>-->
-                            <field name="breakdown_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="breakdown_id" column_invisible="1"/>
-                                    <!--                                    <field name="charges"/>-->
-                                    <field name="unit_price"/>
-                                    <field name="monthly_amount"/>
-                                    <field name="start_data"/>
-                                    <field name="end_data"/>
-                                    <field name="month_number"/>
-                                    <field name="period_rent"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="其他费用">
-                            <field name="other_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="other_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="coping"/>
-                                    <field name="coping_time"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="水费" invisible="not is_water">
-                            <field name="water_fee_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="contract_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="fees_id"/>
-                                    <field name="proportional"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="电费" invisible="not is_electricity">
-                            <field name="electricity_fee_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="contract_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="fees_id"/>
-                                    <field name="proportional"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="管理费" invisible="not is_mange">
-                            <field name="mange_fee_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="contract_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="fees_id"/>
-                                    <field name="proportional"/>
-                                </tree>
-                            </field>
-                        </page>
                         <page string="附件">
                             <group col="2">
                                 <group>
@@ -550,6 +493,7 @@
                             </div>
                             <field name="tax" readonly="1"/>
                             <field name="not_tax_amount" readonly="1"/>
+                            <field name="percentage_damages"/>
                             <field name="first_year_rent"/>
                             <field name="actual_receivable"/>
                             <field name="now_receivable"/>
@@ -571,16 +515,6 @@
                         <field name="miscellaneous"/>
                     </group>
                     <notebook>
-                        <page string="物业列表">
-                            <field name="lease_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="lease_id" column_invisible="1"/>
-                                    <field name="address_id"/>
-                                    <field name="property_area"/>
-                                    <field name="evaluate_unit_price"/>
-                                </tree>
-                            </field>
-                        </page>
                         <page string="租金明细">
                             <field name="breakdown_ids" string=" ">
                                 <tree editable="bottom">
@@ -594,16 +528,6 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="其他费用">
-                            <field name="other_ids" string=" ">
-                                <tree editable="bottom">
-                                    <field name="other_id" column_invisible="1"/>
-                                    <field name="charges"/>
-                                    <field name="coping"/>
-                                    <field name="coping_time"/>
-                                </tree>
-                            </field>
-                        </page>
                         <page string="水费" invisible="not is_water">
                             <field name="water_fee_ids" string=" ">
                                 <tree editable="bottom">
@@ -634,21 +558,15 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="附件">
-                            <group col="2">
-                                <group>
-                                    <field name="license_id" widget="preview_many2one"/>
-                                    <field name="card_id" widget="preview_many2one"/>
-                                    <field name="legal_entity_id" widget="preview_many2one"/>
-                                    <field name="confirmation_transaction_id" widget="preview_many2one"/>
-                                    <field name="handover_time" widget="preview_many2one"/>
-                                </group>
-                                <group>
-                                    <field name="power_attorney_id" widget="preview_many2one"/>
-                                    <field name="handle_cards_id" widget="preview_many2one"/>
-                                    <field name="confirmation_transaction_id" widget="preview_many2one"/>
-                                </group>
-                            </group>
+                        <page string="其他费用">
+                            <field name="other_ids" string=" ">
+                                <tree editable="bottom">
+                                    <field name="other_id" column_invisible="1"/>
+                                    <field name="charges"/>
+                                    <field name="coping"/>
+                                    <field name="coping_time"/>
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 0bdaf601b..bc73380e1 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -135,6 +135,10 @@
               groups="yuthon_hr_employee.group_hr_employee_manager"
               action="hr_contract.action_hr_contract"
               sequence="9"/>
+     <menuitem id="yuthon_financial_management_menu"
+              sequence="17"
+              name="财务管理"
+              parent="yuthon_property_menu_root"/>
     <menuitem id="hr_employee_organization_menu_root_board"
               name="组织结构"
               parent="hr_employee_menu_root_board"