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

!979 结束

Browse Source 
Merge pull request !979 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-12-28 09:09:41 +00:00
committed by Gitee
parent a8ddae153b 27c6614328
commit d3da5eae5f
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/hr_attendance.py
+3 -3
View File
@@ -368,7 +368,7 @@ class HrAttendance(models.Model):
# 粮储-值班
def card_lc_shift_remind_in(self):
ba_up_users = self.env['planning.slot'].search(
[('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '白值班')])
[('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '白值')])
for user in ba_up_users:
if user.start_datetime.date() == fields.date.today():
self.env['card.remind.form'].create({
@@ -380,7 +380,7 @@ class HrAttendance(models.Model):
def card_lc_shift_remind(self):
ba_up_users = self.env['planning.slot'].search(
[('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '白值班')])
[('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '白值')])
for user in ba_up_users:
if user.start_datetime.date() == fields.date.today():
self.env['card.remind.form'].create({
@@ -392,7 +392,7 @@ class HrAttendance(models.Model):
def card_lc_shift_remind_out(self):
ba_up_users = self.env['planning.slot'].search(
[('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '白值班')])
[('role_id.name', '=', '联安粮库'), ('template_id.planning_name', '=', '白值')])
for user in ba_up_users:
if user.start_datetime.date() == fields.date.today():
self.env['card.remind.form'].create({
yuthon_property_approval/models/property_lease_contract.py
+16 -14
View File
@@ -29,6 +29,8 @@ class PropertyLeaseContract(models.Model):
_rec_name = 'name'
name = fields.Char(string='标题')
serial_number = fields.Char(string="流水号")
admin_id = fields.Many2one('res.users', string="管理员")
code = fields.Char(string="合同编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_lease_contract_code'))
property_documents_ids = fields.Many2many('documents.document', string="租赁合同文件")
lessor = fields.Char(string="出租方")
@@ -109,21 +111,21 @@ class PropertyLeaseContract(models.Model):
def onchange_first_year_rent(self):
for record in self:
# 计算首年
if not record.term_start_time:
raise UserError(_("请填写租期开始时间！"))
if not record.term_end_time:
raise UserError(_("请填写租期结束时间！"))
# if not record.term_start_time:
# raise UserError(_("请填写租期开始时间！"))
# if not record.term_end_time:
# raise UserError(_("请填写租期结束时间！"))
if record.term_start_time and record.term_end_time:
start_date = record.term_start_time
end_date = record.term_end_time + relativedelta(days=1)
if start_date + relativedelta(months=12) < end_date:
end_date = start_date + relativedelta(months=12)
all_period_rent = record.my_compute_all_period_rent(start_date, end_date)
record.first_year_rent = all_period_rent
start_date = record.term_start_time
end_date = record.term_end_time + relativedelta(days=1)
if start_date + relativedelta(months=12) < end_date:
end_date = start_date + relativedelta(months=12)
all_period_rent = record.my_compute_all_period_rent(start_date, end_date)
record.first_year_rent = all_period_rent
all_start_date = record.term_start_time
all_end_date = record.term_end_time + relativedelta(days=1)
record.total_contract_receivables = record.my_compute_all_period_rent(all_start_date, all_end_date)
all_start_date = record.term_start_time
all_end_date = record.term_end_time + relativedelta(days=1)
record.total_contract_receivables = record.my_compute_all_period_rent(all_start_date, all_end_date)
@api.onchange("term_end_time", "term_start_time")
yuthon_property_approval/views/property_lease_contract.xml
+2 -2
View File
@@ -62,8 +62,8 @@
月
<!-- <field name="lease_term_month_uom" />-->
</div>
<field name="term_start_time"/>
<field name="term_end_time" />
<field name="term_start_time" required="1"/>
<field name="term_end_time" required="1"/>
</group>
<group>