diff --git a/yuthon_performance/__manifest__.py b/yuthon_performance/__manifest__.py
index 9a887e932..22a5ad2d4 100644
--- a/yuthon_performance/__manifest__.py
+++ b/yuthon_performance/__manifest__.py
@@ -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,
diff --git a/yuthon_performance/models/__init__.py b/yuthon_performance/models/__init__.py
index 794556b5b..59bda62b1 100644
--- a/yuthon_performance/models/__init__.py
+++ b/yuthon_performance/models/__init__.py
@@ -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
\ No newline at end of file
+from . import yuthon_index_management
+from . import yuthon_personal_logs
+from . import yuthon_index_approval
\ No newline at end of file
diff --git a/yuthon_performance/models/yuthon_Index_approval.py b/yuthon_performance/models/yuthon_index_approval.py
similarity index 100%
rename from yuthon_performance/models/yuthon_Index_approval.py
rename to yuthon_performance/models/yuthon_index_approval.py
diff --git a/yuthon_performance/models/yuthon_Index_management.py b/yuthon_performance/models/yuthon_index_management.py
similarity index 100%
rename from yuthon_performance/models/yuthon_Index_management.py
rename to yuthon_performance/models/yuthon_index_management.py
diff --git a/yuthon_performance/views/performacne_menu.xml b/yuthon_performance/views/performacne_menu.xml
index d2eedf652..d1d503c0b 100644
--- a/yuthon_performance/views/performacne_menu.xml
+++ b/yuthon_performance/views/performacne_menu.xml
@@ -3,9 +3,9 @@
-
@@ -13,7 +13,7 @@
parent="yuthon_index_management_menu"
name="组织绩效指标库"
sequence="1"
- action="yuthon_index_management_action1"/>
+ action="yuthon_index_management_action"/>
-
+
@@ -60,7 +60,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
组织绩效
yuthon.index.management
tree,form
diff --git a/yuthon_performance/views/yuthon_performance_menus.xml b/yuthon_performance/views/yuthon_performance_menus.xml
index de7ceb544..323b16cf9 100644
--- a/yuthon_performance/views/yuthon_performance_menus.xml
+++ b/yuthon_performance/views/yuthon_performance_menus.xml
@@ -1,9 +1,9 @@
-
+
+
+
+
diff --git a/yuthon_property/models/yuthon_property.py b/yuthon_property/models/yuthon_property.py
index ca62fb8a8..884732f1c 100644
--- a/yuthon_property/models/yuthon_property.py
+++ b/yuthon_property/models/yuthon_property.py
@@ -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="所属公司")
diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py
index ac2128ede..d148a35a4 100644
--- a/yuthon_property_approval/models/property_lease_contract.py
+++ b/yuthon_property_approval/models/property_lease_contract.py
@@ -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):
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 464e44195..37c829cc2 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -52,6 +52,7 @@
+
@@ -112,6 +113,7 @@
+
@@ -240,10 +242,23 @@
-
+
租赁合同审批
property.lease.contract
tree,form,search
+ [('state','=','new')]
+
+
+ 租赁合同审批
+ property.lease.contract
+ tree,form,search
+ [('state','=','approval')]
+
+
+ 租赁合同审批
+ property.lease.contract
+ tree,form,search
+ [('state','=','cancel')]
批量导入合同
diff --git a/yuthon_property_approval/views/property_menu_all.xml b/yuthon_property_approval/views/property_menu_all.xml
index 3d04b9659..01ce3dcfe 100644
--- a/yuthon_property_approval/views/property_menu_all.xml
+++ b/yuthon_property_approval/views/property_menu_all.xml
@@ -191,11 +191,25 @@
name="物业交接审批"
action="view_property_transfer_action"
sequence="3"/>
-
+
+
+