diff --git a/yuthon_contract/__manifest__.py b/yuthon_contract/__manifest__.py index 1151ece57..d67a00a75 100644 --- a/yuthon_contract/__manifest__.py +++ b/yuthon_contract/__manifest__.py @@ -17,6 +17,7 @@ 'views/inherit_hr_contract_views.xml', 'views/inherit_sale_order_views.xml', + ], 'installable': True, 'application': True, diff --git a/yuthon_contract/models/inherit_hr_contract.py b/yuthon_contract/models/inherit_hr_contract.py index f54c0d607..9eaa7fb41 100644 --- a/yuthon_contract/models/inherit_hr_contract.py +++ b/yuthon_contract/models/inherit_hr_contract.py @@ -7,3 +7,12 @@ class HrContract(models.Model): _inherit = "hr.contract" _description = "员工合同拓展" + first_party = fields.Selection([('thtz','天河投资'), + ('thcj','天河城建'), + ('thwg','天河物管'), + ('thlc','天河粮储存')], + string='甲方') + party_b = fields.Char("乙方") + account = fields.Char("账户") + bank = fields.Char("开户行") + diff --git a/yuthon_contract/models/inherit_sale_order.py b/yuthon_contract/models/inherit_sale_order.py index 0effe307b..0c967deac 100644 --- a/yuthon_contract/models/inherit_sale_order.py +++ b/yuthon_contract/models/inherit_sale_order.py @@ -7,3 +7,45 @@ class SaleOrder(models.Model): _inherit = "sale.order" _description = "租赁合同拓展" + contract_id = fields.Char(string="合同编号") + first_years_rent = fields.Char(string="首年租金") + payout_address = fields.Char(string="物业地址") + uses = fields.Char(string="出租用途") + + contact_number = fields.Char(string="联系电话") + email = fields.Char(string="邮箱") + + deadline_time_point = fields.Char(string="违约金计算时点") + liquidated_damages_ratio = fields.Char(string="违约金比例") + deposit = fields.Float(string="押金") + property_rent_m = fields.Float(string="可租面积", help="单位:0㎡") + unit_price = fields.Float(string="单价") + rent = fields.Char(string="租金", help="单位:元") + rent_changes_regularly = fields.Char(string="租金变化规律", help="每0年递增0%") + lessee = fields.Char(string="承租方") + tax_rate = fields.Char(string="税率") + no_tax_price = fields.Char(string="不含税价") + tax_money = fields.Char(string="税金") + monthly_rent = fields.Char(string="月租金") + total_contract_receivable = fields.Char(string="合同总应收") + contract_date_signing = fields.Char(string="合同签订日期") + handover_date = fields.Char(string="交接日期") + #发票 + billing_type = fields.Char(string="开票类型") + invoice_title = fields.Char(string="开票抬头") + + other_conventions = fields.Text(string='其他约定') + #承租方信息 + industry = fields.Char(string="行业") + partner_name = fields.Char(string="联系人") + partner_address = fields.Char(string="联系人地址") + contact_number = fields.Char(string="联系电话") + email = fields.Char(string="邮箱") + #物业列表 + contracted_property_site = fields.Char(string="合同物业地址") + area = fields.Char(string='建筑面积') + evaluate_reference_price = fields.Char(string="评估单价",help="单位:元/㎡") + + + + diff --git a/yuthon_contract/views/inherit_hr_contract_views.xml b/yuthon_contract/views/inherit_hr_contract_views.xml index 77b001e87..a91b1fbc7 100644 --- a/yuthon_contract/views/inherit_hr_contract_views.xml +++ b/yuthon_contract/views/inherit_hr_contract_views.xml @@ -1,22 +1,27 @@ - - inherit.hr.contract.yuthon.tree - hr.contract - - - + + + + + + - - - + + + inherit.hr.contract.yuthon.form hr.contract - - + + + + + + + diff --git a/yuthon_contract/views/inherit_sale_order_views.xml b/yuthon_contract/views/inherit_sale_order_views.xml index 1df22c69b..23fe7855e 100644 --- a/yuthon_contract/views/inherit_sale_order_views.xml +++ b/yuthon_contract/views/inherit_sale_order_views.xml @@ -1,22 +1,68 @@ - - inherit.sale.renting.yuthon.tree - sale.order - - - - - - - + + + + + + + + + + inherit.sale.renting.yuthon.form sale.order - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +