Merge branch 'master' into dev_zhou

# Conflicts:
#	yuthon_property_approval/wizard/print_payment_wizard.py

yuthon_hr_attendance/controllers/applet_attendance.py

@@ -1035,7 +1035,6 @@ class AppletAttendance(Controller):
     # 根据楼层,状态(reading, unreading) 类型, 获取 列表数据
     @route('/yuthon/meter/reading/list', methods=['POST'], type='http', auth='none', cors='*', csrf=False)
     def yuthon_meter_reading_list(self, **kw):
-        _logger.info('/yuthon/meter/reading/list--接口收到相应')
         reading_state = kw.get('state')
         type = kw.get('type')
         floor_id = int(kw.get('floor_id'))
@@ -1044,11 +1043,10 @@ class AppletAttendance(Controller):
         first_day = today.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
         last_day = (today.replace(day=1) + timedelta(days=32)).replace(day=1) - timedelta(days=1)
         last_day = last_day.replace(hour=23, minute=59, second=59, microsecond=999999)
-
         first_day_str = first_day.strftime('%Y-%m-%d')
         last_day_str = last_day.strftime('%Y-%m-%d')
-
         floor_name = request.env['yuthon.epitope.values'].sudo().search([('id', '=', floor_id)]).name
+        _logger.info(f'楼层{floor_name}')
         # domain = [('state', '=', reading_state),
         #           ('epitope_values_id.name', '=', floor_name),
         #           ('meter_date', '>=', first_day_str),
@@ -1066,7 +1064,7 @@ class AppletAttendance(Controller):
             domain.append(('water_state', '!=', 'stop'))
             model = 'meter.water.line'
         records = request.env[model].sudo().search(domain)
-        _logger.info(f'任务数据{records}')
+        # _logger.info(f'任务数据{records}')
         result = []
         for record in records:
             property_infos = record.yuthon_property_ids if record.yuthon_property_ids else [None]

yuthon_property_approval/report/contract_accounts_receivable_templates.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
-
     <template id="external_layout_standard">
         <div t-attf-class="header o_company_#{company.id}_layout" t-att-style="report_header_style">
 
@@ -152,6 +150,7 @@
                 </t>
             </t>
     </template>
+
 </odoo>