diff --git a/yuthon_holiday/report/hr_leave_batch_report_action.xml b/yuthon_holiday/report/hr_leave_batch_report_action.xml index f983fb2d4..7d7d2d628 100644 --- a/yuthon_holiday/report/hr_leave_batch_report_action.xml +++ b/yuthon_holiday/report/hr_leave_batch_report_action.xml @@ -18,7 +18,7 @@ report - '请假单 - %s' % (object.name or '') + '%s_%s_%s' % (object.name or '', object.users_id.name or '', ((object.log_ids.filtered(lambda l: l.name == '归档')[-1].lase_click_date or object.log_ids.filtered(lambda l: l.name == '归档')[-1].date_create).strftime('%Y-%m-%d') if object.log_ids.filtered(lambda l: l.name == '归档') else '')) \ No newline at end of file diff --git a/yuthon_hr_attendance/report/overtime_approval_report.xml b/yuthon_hr_attendance/report/overtime_approval_report.xml index 25ba2824b..42f485c04 100644 --- a/yuthon_hr_attendance/report/overtime_approval_report.xml +++ b/yuthon_hr_attendance/report/overtime_approval_report.xml @@ -12,7 +12,7 @@ yuthon_hr_attendance.overtime_approval_print_template yuthon_hr_attendance.overtime_approval_print_template - '加班单-%s' % (object.code or object.name) + '%s_%s_%s' % (object.name or object.code or '', object.users_id.name or '', ((object.log_ids.filtered(lambda l: l.name == '归档')[-1].lase_click_date or object.log_ids.filtered(lambda l: l.name == '归档')[-1].date_create).strftime('%Y-%m-%d') if object.log_ids.filtered(lambda l: l.name == '归档') else '')) report diff --git a/yuthon_hr_employee_approval/report/contract_review_report.xml b/yuthon_hr_employee_approval/report/contract_review_report.xml index cf5417bcd..7f19d2afc 100644 --- a/yuthon_hr_employee_approval/report/contract_review_report.xml +++ b/yuthon_hr_employee_approval/report/contract_review_report.xml @@ -16,7 +16,7 @@ yuthon_hr_employee_approval.contract_review_report_document report - '合同审查单 - %s' % (object.name or '') + '%s_%s_%s' % (object.name or '', object.user_id.name or '', ((object.log_ids.filtered(lambda l: l.name == '归档')[-1].lase_click_date or object.log_ids.filtered(lambda l: l.name == '归档')[-1].date_create).strftime('%Y-%m-%d') if object.log_ids.filtered(lambda l: l.name == '归档') else '')) \ No newline at end of file diff --git a/yuthon_hr_employee_approval/report/leaving_approval_report.xml b/yuthon_hr_employee_approval/report/leaving_approval_report.xml index 9fb386188..98ecbb3a1 100644 --- a/yuthon_hr_employee_approval/report/leaving_approval_report.xml +++ b/yuthon_hr_employee_approval/report/leaving_approval_report.xml @@ -16,7 +16,7 @@ yuthon_hr_employee_approval.leaving_approval_report_document report - '离职申请 - %s' % (object.name or '') + '%s_%s_%s' % (object.name or '', object.users_id.name or '', ((object.log_ids.filtered(lambda l: l.name == '归档')[-1].lase_click_date or object.log_ids.filtered(lambda l: l.name == '归档')[-1].date_create).strftime('%Y-%m-%d') if object.log_ids.filtered(lambda l: l.name == '归档') else '')) \ No newline at end of file diff --git a/yuthon_property_approval/report/property_lease_contract_print_report.xml b/yuthon_property_approval/report/property_lease_contract_print_report.xml index 718209013..323d44875 100644 --- a/yuthon_property_approval/report/property_lease_contract_print_report.xml +++ b/yuthon_property_approval/report/property_lease_contract_print_report.xml @@ -14,7 +14,7 @@ qweb-pdf yuthon_property_approval.property_lease_contract_print_template yuthon_property_approval.property_lease_contract_print_template - '租赁合同审批单-%s' % (object.contract_code or object.code) + '%s_%s_%s' % (object.display_name or object.contract_code or object.code or '', object.users_id.name or '', ((object.log_ids.filtered(lambda l: l.name == '归档')[-1].lase_click_date or object.log_ids.filtered(lambda l: l.name == '归档')[-1].date_create).strftime('%Y-%m-%d') if object.log_ids.filtered(lambda l: l.name == '归档') else '')) report diff --git a/yuthon_purchase/report/purchase_order_print_report.xml b/yuthon_purchase/report/purchase_order_print_report.xml index c78e4de9e..1d7236bfb 100644 --- a/yuthon_purchase/report/purchase_order_print_report.xml +++ b/yuthon_purchase/report/purchase_order_print_report.xml @@ -14,7 +14,7 @@ qweb-pdf yuthon_purchase.purchase_order_print_template yuthon_purchase.purchase_order_print_template - '采购审批单-%s' % (object.name or '') + '%s_%s_%s' % (object.name or '', object.user_id.name or '', ((object.log_ids.filtered(lambda l: l.name == '归档')[-1].lase_click_date or object.log_ids.filtered(lambda l: l.name == '归档')[-1].date_create).strftime('%Y-%m-%d') if object.log_ids.filtered(lambda l: l.name == '归档') else '')) report diff --git a/yuthon_stock/views/inherit_stock_picking.xml b/yuthon_stock/views/inherit_stock_picking.xml index 12c651f46..1d0222698 100644 --- a/yuthon_stock/views/inherit_stock_picking.xml +++ b/yuthon_stock/views/inherit_stock_picking.xml @@ -67,9 +67,6 @@ - - - 1 diff --git a/yuthon_trade/report/business_approval_print_report.xml b/yuthon_trade/report/business_approval_print_report.xml index f460a9584..c37db5f66 100644 --- a/yuthon_trade/report/business_approval_print_report.xml +++ b/yuthon_trade/report/business_approval_print_report.xml @@ -16,7 +16,7 @@ yuthon_trade.business_approval_print_report_document report - '业务审批单 - %s' % (object.name or '') + '%s_%s_%s' % (object.name or '', object.users_id.name or '', ((object.log_ids.filtered(lambda l: l.name == '归档')[-1].lase_click_date or object.log_ids.filtered(lambda l: l.name == '归档')[-1].date_create).strftime('%Y-%m-%d') if object.log_ids.filtered(lambda l: l.name == '归档') else '')) \ No newline at end of file