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

!4493 !4492 添加功能

Browse Source 
Merge pull request !4493 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-08-13 01:32:54 +00:00
committed by Gitee
parent 0a6e6c52d0 7bfa7097e5
commit 6c868601fb
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/controllers/applet_attendance.py
+1 -1
View File
@@ -120,7 +120,7 @@ class AppletAttendance(Controller):
'缺卡'] else f'<p style="color:green">{check_out_str}</p>'
state = "no"
message = "超出范围或wifi未连接，不允许打卡"
address_ids = request.env(user=SUPERUSER_ID)["applet.address"].search([])
address_ids = request.env(user=SUPERUSER_ID)["applet.address"].search([('company_id', '=', employee_id.company_id.id)])
if kw['att_latitude'] != kw['att_longitude']:
self_address = self.get_address_from_coords(kw['att_latitude'], kw['att_longitude'])
else:
yuthon_official/__manifest__.py
+1 -1
View File
@@ -23,7 +23,7 @@
'views/yuthon_official_incoming_labor_views.xml',
'views/yuthon_official_party_views.xml',
'views/yuthon_official_incoming_party_views.xml',
'views/inherit_soong_workflow_insector_views.xml',
# 'views/inherit_soong_workflow_insector_views.xml',
'views/inherit_room_booking_views.xml',
'views/inherit_issue_library_views.xml',
'views/official_menus.xml',
yuthon_property_approval/views/property_lease_contract.xml
+29 -29
View File
@@ -316,6 +316,20 @@
</field>
</page>
</notebook>
<group col="4">
<group>
<field name="tax" readonly="1" force_save="1"/>
</group>
<group>
<field name="not_tax_amount" readonly="1" force_save="1"/>
</group>
<group>
<field name="first_year_rent" force_save="1"/>
</group>
<group>
<field name="total_contract_receivables" style="font-size: 1.2rem; font-weight: bold;"/>
</group>
</group>
<notebook>
<page string="附件">
<group col="2">
@@ -335,20 +349,6 @@
</group>
</page>
</notebook>
<group col="4">
<group>
<field name="tax" readonly="1" force_save="1"/>
</group>
<group>
<field name="not_tax_amount" readonly="1" force_save="1"/>
</group>
<group>
<field name="first_year_rent" force_save="1"/>
</group>
<group>
<field name="total_contract_receivables" style="font-size: 1.2rem; font-weight: bold;"/>
</group>
</group>
</sheet>
</form>
</field>
@@ -722,6 +722,21 @@
</field>
</page>
</notebook>
<group col="4">
<group>
<field name="tax" readonly="1" force_save="1"/>
</group>
<group>
<field name="not_tax_amount" readonly="1" force_save="1"/>
</group>
<group>
<field name="first_year_rent" force_save="1" readonly="1"/>
</group>
<group>
<field name="total_contract_receivables" style="font-size: 1.2rem; font-weight: bold;"
readonly="1"/>
</group>
</group>
<notebook>
<page string="附件">
<group col="2">
@@ -748,21 +763,6 @@
<field name="contract_date"/>
</group>
</group>
<group col="4">
<group>
<field name="tax" readonly="1" force_save="1"/>
</group>
<group>
<field name="not_tax_amount" readonly="1" force_save="1"/>
</group>
<group>
<field name="first_year_rent" force_save="1" readonly="1"/>
</group>
<group>
<field name="total_contract_receivables" style="font-size: 1.2rem; font-weight: bold;"
readonly="1"/>
</group>
</group>
</sheet>
</form>
</field>