pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加功能

Browse Source
This commit is contained in:
zhou
2025-08-12 18:09:02 +08:00
parent 140f916fd2
commit 556a642407
31 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/models/soong_workflow_entrust.py
+1
View File
@@ -134,3 +134,4 @@ class EntrustAll(models.Model):
_description = "全部流程"
name = fields.Char(string='name')
work_end = fields.Boolean(string='流程结束')
soong_workflow/views/soong_workflow_entrust_views.xml
+1
View File
@@ -73,6 +73,7 @@
<sheet>
<group>
<field name="name" required="1"/>
<field name="work_end" invisible="1"/>
</group>
</sheet>
</form>
yuthon_holiday/models/inherit_hr_leave.py
+1 -1
View File
@@ -710,7 +710,7 @@ class HolidaysRequestBatch(models.Model):
@api.depends('users_id')
def _compute_holiday_allowance(self):
for record in self:
reports_id = self.env['yuthon.vacation.reports'].search([('employee_id', '=', record.users_id.employee_id.id)], limit=1)
reports_id = self.env['yuthon.vacation.reports'].search([('employee_id', '=', record.users_id.employee_ids.id)], limit=1)
if reports_id and not record.log_ids:
leave_days = reports_id.leave
overtime_days = reports_id.working_overtime
yuthon_holiday/views/hr_leave_batch.xml
+1 -1
View File
@@ -54,7 +54,7 @@
<field name="create_date" invisible="1"/>
<field name="work_end" invisible="1"/>
<field name="document_ids" widget="preview_many2many" options="{'show_select_btn': false}"/>
<field name="holiday_allowance"/>
<field name="holiday_allowance" readonly="1"/>
</group>
</group>
<group>
yuthon_holiday/views/yuthon_fixes_approval_views.xml
+1
View File
@@ -43,6 +43,7 @@
</div>
<group string="审批事项">
<group>
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="work_end" invisible="1"/>
yuthon_hr_attendance/models/go_approval.py
+3 -3
View File
@@ -64,7 +64,7 @@ class GoApprovals(models.Model):
if start > end:
raise ValidationError("开始时间必须小于结束时间，请重新设置。")
delta = end - start
self.days = delta.days
self.days = (delta.days) + 1
self.hours = delta.seconds // 3600
@api.onchange('is_issues')
@@ -97,7 +97,7 @@ class GoApprovals(models.Model):
for record in self:
if record.statr_date and record.end_date:
delta = record.end_date - record.statr_date
record.days = delta.days if delta.days >= 0 else 0 # 防止负数
record.days = delta.days + 1 if delta.days >= 0 else 0 # 防止负数
else:
record.days = 0
@@ -124,7 +124,7 @@ class GoApprovals(models.Model):
"""根据开始日期和天数计算结束日期"""
if self.statr_date and self.days:
# 计算结束日期
self.end_date = self.statr_date + timedelta(days=self.days)
self.end_date = self.statr_date + timedelta(days=self.days) - timedelta(days=1)
@api.onchange('hours')
def _onchange_calculate_end_datetime(self):
yuthon_hr_attendance/models/hr_attendance.py
+3
View File
@@ -332,6 +332,9 @@ class HrAttendance(models.Model):
"res_model": "go.approval",
"views": [[form_id, "form"]],
"context": {
'default_is_day': True,
'default_statr_date': self.current_data,
'default_end_date': self.current_data,
'default_users_id': self.employee_id.user_id.id,
}
}
yuthon_hr_attendance/wizard/attendance_controls_wizard.py
+4
View File
@@ -54,6 +54,10 @@ class AttendanceControlsWizard(models.TransientModel):
"views": [[form_id, "form"]],
"context": {
'default_users_id': self.attendance_id.employee_id.user_id.id,
'default_is_day': True,
'reason_application': '事由',
'default_statr_date': self.attendance_id.current_data,
'default_end_date': self.attendance_id.current_data,
}
}
yuthon_hr_employee_approval/models/yuthon_system_approval.py
+1
View File
@@ -11,4 +11,5 @@ class YuthonSystemTitleApproval(models.Model):
name = fields.Char(string='名称')
code = fields.Char(string="编号",
default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_system_approval_code'))
work_end = fields.Boolean()
active = fields.Boolean('Active', default=True, tracking=True)
yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml
+1
View File
@@ -18,6 +18,7 @@
<sheet>
<group>
<field name="name"/>
<field name="work_end" invisible="1"/>
</group>
</sheet>
</form>
yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml
+1
View File
@@ -18,6 +18,7 @@
<sheet>
<group>
<field name="name"/>
<field name="work_end" invisible="1"/>
</group>
</sheet>
</form>
yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml
+1
View File
@@ -45,6 +45,7 @@
</h1>
</div>
<group string="审批事项">
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="work_end" invisible="1"/>
<field name="issues_result" invisible="is_issues == False"/>
yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml
+1
View File
@@ -18,6 +18,7 @@
<sheet>
<group>
<field name="name"/>
<field name="work_end" invisible="1"/>
</group>
</sheet>
</form>
yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml
+1
View File
@@ -18,6 +18,7 @@
<sheet>
<group>
<field name="name"/>
<field name="work_end" invisible="1"/>
</group>
</sheet>
</form>
yuthon_performance/views/yuthon_tissue_duty_approval.xml
+1
View File
@@ -22,6 +22,7 @@
<sheet>
<group col="3">
<group>
<field name="work_end" invisible="1"/>
<field name="users_id"/>
<field name="code"/>
<field name="creation_time"/>
yuthon_property/views/yuthon_property_views.xml
+3 -3
View File
@@ -287,10 +287,10 @@
<filter name="referred_id" string="地段" context="{'group_by': 'referred_id'}"/>
</group>
<searchpanel>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
<field name="property_floor_id"/>
<field name="company_id" enable_counters="1" />
<field name="tenure_type" enable_counters="1" string="权属类型"/>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
</searchpanel>
</search>
</field>
@@ -371,9 +371,9 @@
<filter string="权属类型" name="group_by_tenure_type" context="{'group_by': 'tenure_type'}"/>
</group>
<searchpanel>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
<field name="company_id" enable_counters="1" />
<field name="tenure_type" enable_counters="1" string="权属类型"/>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
</searchpanel>
</search>
</field>
@@ -414,9 +414,9 @@
<filter string="权属类型" name="group_by_tenure_type" context="{'group_by': 'tenure_type'}"/>
</group>
<searchpanel>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
<field name="company_id" enable_counters="1" />
<field name="tenure_type" enable_counters="1" string="权属类型"/>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
</searchpanel>
</search>
</field>
yuthon_property_approval/views/inherit_yuthon_property_views.xml
+1 -1
View File
@@ -381,9 +381,9 @@
<filter string="权属类型" name="group_by_tenure_type" context="{'group_by': 'tenure_type'}"/>
</group>
<searchpanel>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
<field name="company_id" enable_counters="1" />
<field name="tenure_type" enable_counters="1" string="权属类型"/>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
</searchpanel>
</search>
</field>
yuthon_property_approval/views/property_billing_confirmation.xml
+1
View File
@@ -27,6 +27,7 @@
<group>
<field name="code"/>
<field name="property_documents_ids">
<field name="work_end" invisible="1"/>
<tree>
<field name="name"/>
</tree>
yuthon_property_approval/views/property_collection_confirm.xml
+1
View File
@@ -26,6 +26,7 @@
<group>
<group>
<field name="code"/>
<field name="work_end" invisible="1"/>
<field name="property_documents_ids">
<tree>
<field name="name"/>
yuthon_property_approval/views/property_confirm_views.xml
+1
View File
@@ -25,6 +25,7 @@
</div>
<group>
<group>
<field name="work_end" invisible="1"/>
<field name="code"/>
<field name="lessee"/>
</group>
yuthon_property_approval/views/property_construction_work.xml
+1
View File
@@ -23,6 +23,7 @@
</div>
<group>
<field name="code"/>
<field name="work_end" invisible="1"/>
</group>
</sheet>
</form>
yuthon_property_approval/views/property_information.xml
+1
View File
@@ -26,6 +26,7 @@
<group>
<group>
<field name="code"/>
<field name="work_end" invisible="1"/>
<field name="property_documents_ids">
<tree>
<field name="name"/>
yuthon_property_approval/views/property_lease_contract.xml
+1 -1
View File
@@ -818,9 +818,9 @@
<filter string="权属类型" name="group_by_tenure_type" context="{'group_by': 'tenure_type'}"/>
</group>
<searchpanel>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
<field name="company_id" enable_counters="1"/>
<field name="tenure_type" enable_counters="1" string="权属类型"/>
<field name="precinct_id" string="所属片区" enable_counters="1"/>
</searchpanel>
</search>
</field>
yuthon_property_approval/views/property_lease_renewal.xml
+1
View File
@@ -25,6 +25,7 @@
</div>
<group>
<group>
<field name="work_end" invisible="1"/>
<field name="code"/>
<field name="property_documents_ids">
<tree>
yuthon_property_approval/views/property_management.xml
+4 -5
View File
@@ -39,7 +39,6 @@
<group>
<field name="related_issues_id" invisible="is_issues == False"/>
</group>
</group>
<div class="col-12 text-center">
<h1>
@@ -92,16 +91,16 @@
</tree>
</field>
</group>
<group col="6">
<group col="5">
<group>
<field name="company_id"/>
</group>
<group>
<field name="tenure_type"/>
</group>
<group>
<field name="admin_id_all" invisible="1"/>
</group>
<!-- <group>-->
<!-- <field name="admin_id_all" invisible="1"/>-->
<!-- </group>-->
<group>
<field name="precinct_id"/>
</group>
yuthon_property_approval/views/property_open_rent_views.xml
+1
View File
@@ -26,6 +26,7 @@
<group>
<group>
<field name="code"/>
<field name="work_end" invisible="1"/>
<field name="rental_area"/>
<field name="upset"/>
</group>
yuthon_property_approval/views/property_utility_bills.xml
+1
View File
@@ -25,6 +25,7 @@
<group>
<group>
<field name="code"/>
<field name="work_end" invisible="1"/>
<field name="property_documents_ids">
<tree>
<field name="name"/>
yuthon_trade/models/inherit_workflow_record.py
+3 -1
View File
@@ -19,8 +19,10 @@ class InheritWorkflowRecord(models.Model):
soong_workflow_list.append((0, 0, {
'workflow_record_id': record.id,
}))
if related_record.document_ids:
if hasattr(related_record, 'document_ids') and related_record.document_ids:
document_list.extend(related_record.document_ids.ids)
elif hasattr(related_record, 'documents_ids') and related_record.documents_ids:
document_list.extend(related_record.documents_ids.ids)
return {
"name": _("盖章审批"),
yuthon_trade/views/yuthon_mutual_approval_views.xml
+1
View File
@@ -40,6 +40,7 @@
</div>
<group string="审批事项">
<group>
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="department_id" invisible="1"/>
yuthon_trade/views/yuthon_trade_activities.xml
+1
View File
@@ -32,6 +32,7 @@
</group>
</group>
<group>
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="theme"/>
<field name="background_event"/>
yuthon_trade/views/yuthon_trade_premium.xml
+1
View File
@@ -38,6 +38,7 @@
</div>
<group string="审批事项">
<group>
<field name="work_end" invisible="1"/>
<field name="name"/>
<field name="users_id"/>
<field name="department_id" invisible="1"/>