!1201 结束

Merge pull request !1201 from 李鹏宇/dev

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("已经创建了相关的上会记录，不能取消勾选")
 
-
-
-

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"/>

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">

yuthon_property/views/menuitem.xml

@@ -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="物业来源"

yuthon_property_approval/models/property_lease_contract.py

@@ -815,6 +815,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 = '物业列表明细行'
@@ -832,7 +838,7 @@ class PropertyRentBreakdownLine(models.Model):
     breakdown_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
     charges = fields.Char(string="收费项")
     unit_price = fields.Float(string="单价")
-    monthly_amount = fields.Float(string="月租金")
+    monthly_amount = fields.Float(string="月租金", digits=(16, 0))
     start_data = fields.Date(string="开始日期")
     end_data = fields.Date(string="结束日期")
     month_number = fields.Integer(string="期间月数")

yuthon_property_approval/views/property_lease_contract.xml

@@ -205,7 +205,10 @@
                             <field name="tax" readonly="1"/>
                             <field name="not_tax_amount" readonly="1"/>
                             <field name="first_year_rent"/>
-                            <field name="total_contract_receivables"/>
+                            <label for="total_contract_receivables" class="fw-bold fw-bolder fs-3"/>
+                            <div class="fw-bold fw-bolder fs-3">
+                                <field name="total_contract_receivables"/>
+                            </div>
                         </group>
                     </group>
                     <group col="3">