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-01-04 10:01:14 +08:00
parent ad2180b31c
commit 891d956160
12 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_performance/__manifest__.py
+4 -3
View File
@@ -14,14 +14,13 @@
'data': [
'security/ir.model.access.csv',
'data/library_changes_data.xml',
'views/performacne_menu.xml',
'views/yuthon_Index_management.xml',
'views/yuthon_index_management.xml',
'views/yuthon_duty_management.xml',
'views/yuthon_performance_menus.xml',
'views/yuthon_plan_management.xml',
'views/yuthon_departmental_responsible_views.xml',
'views/yuthon_personal_logs_views.xml',
'views/yuthon_Index_approval.xml',
'views/yuthon_index_approval.xml',
'views/yuthon_tissue_duty_approval.xml',
'views/yuthon_index_employee.xml',
'views/yuthon_employee_approval.xml',
@@ -31,7 +30,9 @@
'views/yuthon_grading_tasks.xml',
'views/yuthon_employee_appraisal.xml',
'views/yuthon_kpi_tasks.xml',
'views/performacne_menu.xml',
'wizard/yuthon_assessment_tasks_wizard_views.xml',
],
'installable': True,
'application': True,
yuthon_performance/models/__init__.py
+3 -3
View File
@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*-
from . import yuthon_employee_approval
from . import yuthon_Index_management
from . import yuthon_duty_management
from . import yuthon_plan_management
from . import yuthon_Index_approval
from . import yuthon_tissue_duty_approval
from . import yuthon_index_employee
from . import yuthon_plan_approval
@@ -13,4 +11,6 @@ from . import yuthon_grading_tasks
from . import yuthon_kpi_tasks
from . import yuthon_employee_appraisal
from . import yuthon_departmental_responsible
from . import yuthon_personal_logs
from . import yuthon_index_management
from . import yuthon_personal_logs
from . import yuthon_index_approval
yuthon_performance/models/yuthon_Index_approval.py → yuthon_performance/models/yuthon_index_approval.py
View File
yuthon_performance/models/yuthon_Index_management.py → yuthon_performance/models/yuthon_index_management.py
View File
yuthon_performance/views/performacne_menu.xml
+3 -3
View File
@@ -3,9 +3,9 @@
<!-- 绩效考核 -->
<menuitem id="yuthon_performance_menu_config_root"
name="绩效考核"
web_icon="yuthon_performance,static/description/icon.png"
web_icon="yuthon_performance,static/description/icon.png"
sequence="13"/>
<menuitem id="yuthon_index_management_menu"
<menuitem id="yuthon_index_management_menu"
parent="yuthon_performance_menu_config_root"
name="指标库"
sequence="1"/>
@@ -13,7 +13,7 @@
parent="yuthon_index_management_menu"
name="组织绩效指标库"
sequence="1"
action="yuthon_index_management_action1"/>
action="yuthon_index_management_action"/>
<menuitem id="yuthon_employee_performance_library"
parent="yuthon_index_management_menu"
name="员工绩效指标库"
yuthon_performance/views/yuthon_Index_approval.xml → yuthon_performance/views/yuthon_index_approval.xml
View File
yuthon_performance/views/yuthon_Index_management.xml → yuthon_performance/views/yuthon_index_management.xml
+3 -3
View File
@@ -40,7 +40,7 @@
<field name="index_name" required="1"/>
</h1>
</div>
<group col="4">
<group col="4">
<group>
<field name="sequence"/>
<field name="employee_ids" widget="many2many_tags"/>
@@ -60,7 +60,7 @@
<field name="end_index_time"/>
<field name="development_goals"/>
</group>
</group>
</group>
<group>
<field name="index_compute"/>
<field name="check_norm"/>
@@ -71,7 +71,7 @@
</field>
</record>
<!-- Action-->
<record id="yuthon_index_management_action1" model="ir.actions.act_window">
<record id="yuthon_index_management_action" model="ir.actions.act_window">
<field name="name">组织绩效</field>
<field name="res_model">yuthon.index.management</field>
<field name="view_mode">tree,form</field>
yuthon_performance/views/yuthon_performance_menus.xml
+4 -4
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<menuitem id="yuthon_performance_menu_config_root"
name="绩效考核"
web_icon="yuthon_performance,static/description/icon.png"
sequence="5"/>
<!-- <menuitem id="yuthon_performance_menu_config_root"-->
<!-- name="绩效考核"-->
<!-- web_icon="yuthon_performance,static/description/icon.png"-->
<!-- sequence="5"/>-->
<!-- <menuitem id="yuthon_performance_duty_menu"-->
<!-- parent="yuthon_performance_menu_config_root"-->
<!-- name="绩效考核"-->
yuthon_property/models/yuthon_property.py
+1 -1
View File
@@ -58,7 +58,7 @@ class YuthonProperty(models.Model):
start_time = fields.Date(string="生效时间")
end_date = fields.Date(string="失效日期")
purpose_id = fields.Many2one('yuthon.resource.purpose', string="管理类型")
admin_id = fields.Many2one('res.users', string="管理员")
admin_id = fields.Many2one('res.users', string="片区管理员")
lessee_id = fields.Many2one('property.tenant.information', string='承租方')
title_address = fields.Many2one('yuthon.property.message', string="产权地址")
company_id = fields.Many2one('yuthon.property.company', string="所属公司")
yuthon_property_approval/models/property_lease_contract.py
+5 -4
View File
@@ -92,6 +92,7 @@ class PropertyLeaseContract(models.Model):
is_mange = fields.Boolean(string="是否有管理费")
miscellaneous = fields.Text(string="其他约定")
total_area = fields.Float(string="总面积", digits=(16, 4))
state = fields.Selection([('new', '新建'),('approval','审批'),('cancel','作废')], string="状态", default='new')
contract_type = fields.Selection([('lease_renewal', '续租'), ('interim', '临租'), ('new', '补充协议'), ('first', '首租')], string="合同类型", default='first')
lease_ids = fields.One2many('property.lease.contract.line', 'lease_id',string="物业信息明细行")
breakdown_ids = fields.One2many('property.rent.breakdown.line', 'breakdown_id', string="物业租金明细行")
@@ -432,10 +433,10 @@ class PropertyLeaseContract(models.Model):
"period_rent": monthly_amount * increments_month,
})
@api.onchange("first_year_rent")
def _onchange_first_year_rent(self):
for rec in self:
rec.performance_bonds = rec.first_year_rent * 2
# @api.onchange("first_year_rent")
# def _onchange_first_year_rent(self):
# for rec in self:
# rec.performance_bonds = rec.first_year_rent * 2
# @api.onchange("total_area", "unit_price")
# def _onchange_deposit(self):
yuthon_property_approval/views/property_lease_contract.xml
+16 -1
View File
@@ -52,6 +52,7 @@
<field name="department_id" invisible="1"/>
<field name="name" required="1"/>
<field name="use_address"/>
<field name="state"/>
</group>
<notebook>
<page string="物业列表">
@@ -112,6 +113,7 @@
<field name="contact" required="1"/>
<field name="phone" required="1"/>
<field name="email" required="1"/>
<field name="tax_number" required="1"/>
</group>
<group>
<field name="invoicing_type" required="1"/>
@@ -240,10 +242,23 @@
</search>
</field>
</record>
<record id="property_lease_contract_action" model="ir.actions.act_window">
<record id="property_lease_contract_new_action" model="ir.actions.act_window">
<field name="name">租赁合同审批</field>
<field name="res_model">property.lease.contract</field>
<field name="view_mode">tree,form,search</field>
<field name="domain">[('state','=','new')] </field>
</record>
<record id="property_lease_contract_approval_action" model="ir.actions.act_window">
<field name="name">租赁合同审批</field>
<field name="res_model">property.lease.contract</field>
<field name="view_mode">tree,form,search</field>
<field name="domain">[('state','=','approval')]</field>
</record>
<record id="property_lease_contract_cancel_action" model="ir.actions.act_window">
<field name="name">租赁合同审批</field>
<field name="res_model">property.lease.contract</field>
<field name="view_mode">tree,form,search</field>
<field name="domain">[('state','=','cancel')]</field>
</record>
<record id="all_data_write_property_contract" model="ir.actions.server">
<field name="name">批量导入合同</field>
yuthon_property_approval/views/property_menu_all.xml
+16 -2
View File
@@ -191,11 +191,25 @@
name="物业交接审批"
action="view_property_transfer_action"
sequence="3"/>
<menuitem id="property_lease_contract_menu"
<menuitem id="property_lease_contract_menu"
parent="yuthon_property.yuthon_property_estate_menu"
name="物业合同管理"
action="property_lease_contract_action"
sequence="1"/>
<menuitem id="property_lease_contract_new_menu"
parent="property_lease_contract_menu"
name="新建"
action="property_lease_contract_new_action"
sequence="1"/>
<menuitem id="property_lease_contract_approval_menu"
parent="property_lease_contract_menu"
name="审批"
action="property_lease_contract_approval_action"
sequence="3"/>
<menuitem id="property_lease_contract_cancel_menu"
parent="property_lease_contract_menu"
name="作废"
action="property_lease_contract_cancel_action"
sequence="5"/>
<!--财务报表 -->
<menuitem id="yuthon_property_process"
sequence="99"