李鹏宇
@@ -32,6 +32,7 @@ class PropertyLeaseContract(models.Model):
|
||||
code = fields.Char(string="流水号", default=lambda self: self.env['ir.sequence'].next_by_code('property_lease_contract_code'))
|
||||
admin_id = fields.Many2one('res.users', string="管理员")
|
||||
contract_code = fields.Char(string="合同编号")
|
||||
contract_date = fields.Date(string="合同签订日期")
|
||||
property_documents_ids = fields.Many2many('ir.attachment', string="租赁合同文件")
|
||||
company_id = fields.Many2one('yuthon.property.company', string="出租方")
|
||||
rent_company = fields.Char(related='company_id.name', string="收租公司名称")
|
||||
@@ -55,8 +56,8 @@ class PropertyLeaseContract(models.Model):
|
||||
# lease_term_year_uom = fields.Selection([('year', '年')], default="year", readonly=True, string="免租期单位")
|
||||
lease_term_month = fields.Integer(string="租期(月)")
|
||||
# lease_term_month_uom = fields.Selection([('month', '月')], default="month", readonly=True, string="免租期单位")
|
||||
term_start_time = fields.Date(string="租期开始时间", default=fields.Datetime.now)
|
||||
term_end_time = fields.Date(string="租期结束时间")
|
||||
term_start_time = fields.Date(string="开始时间", default=fields.Datetime.now)
|
||||
term_end_time = fields.Date(string="结束时间")
|
||||
cycle_dict =fields.Selection([('monthly','月度'), ('quarter','季度'), ('half','半年'),('year','年度')],string='付款方式')
|
||||
cycle_mode = fields.Selection([('fixed_monthly','合同月'), ('floating_monthly','自然月'), ('fixed_quarter', '合同季'), ('floating_quarter', '自然季'),
|
||||
('fixed_year', '合同年'), ('floating_year', '自然年')], string='周期方式', default='fixed_monthly')
|
||||
@@ -70,8 +71,8 @@ class PropertyLeaseContract(models.Model):
|
||||
increments_every_few_years = fields.Integer(string="每几年递增")
|
||||
|
||||
rent_free_period = fields.Datetime(string="免租期")
|
||||
rent_free_period_year = fields.Integer(string="免租期")
|
||||
rent_free_period_month = fields.Integer(string="免租期")
|
||||
rent_free_period_days = fields.Integer(string="免租期")
|
||||
|
||||
breach_time = fields.Date(string="违约计算时点")
|
||||
percentage_liquidated_damages = fields.Many2one('yuthon.penalty.setting', string="违约金比例")
|
||||
@@ -79,8 +80,7 @@ class PropertyLeaseContract(models.Model):
|
||||
date_payment_day = fields.Integer(string="每日支付日期")
|
||||
first_pay = fields.Date(string="首次付款日")
|
||||
unit_price = fields.Float(string="单价")
|
||||
is_deposit = fields.Boolean(string="押金")
|
||||
is_performance_bonds = fields.Boolean(string="履约保证金")
|
||||
deposit_type = fields.Selection([('deposit','押金'),('performance','履约保证金')], string="押金/履约保证金")
|
||||
deposit = fields.Float(string="押金")
|
||||
performance_bonds = fields.Float(string="履约保证金")
|
||||
performance_bonds_write = fields.Char(string="履约保证金大写")
|
||||
@@ -113,7 +113,6 @@ class PropertyLeaseContract(models.Model):
|
||||
handle_cards_id = fields.Many2one('ir.attachment', string="经办人身份证")
|
||||
confirmation_transaction_id = fields.Many2one('ir.attachment', string="成交确认书")
|
||||
responsibility_book_id = fields.Many2one('ir.attachment', string="安全生产责任书")
|
||||
contract_time = fields.Date(string="合同签订日期")
|
||||
handover_time = fields.Date(string="交接日期")
|
||||
|
||||
@api.onchange("term_start_time", "term_end_time",
|
||||
|
||||
@@ -6,13 +6,14 @@
|
||||
<field name="arch" type="xml">
|
||||
<tree string="租赁合同审批">
|
||||
<field name="code"/>
|
||||
<field name="contract_code"/>
|
||||
<field name="lessee_id"/>
|
||||
<field name="name"/>
|
||||
<field name="lease_term_year"/>
|
||||
<field name="lease_term_month"/>
|
||||
<field name="term_start_time"/>
|
||||
<field name="term_end_time"/>
|
||||
<field name="rent"/>
|
||||
<field name="deposit"/>
|
||||
<field name="contract_time"/>
|
||||
<field name="contract_date"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
@@ -32,6 +33,24 @@
|
||||
<group>
|
||||
<field name="code" readonly="1" string="流水号:"/>
|
||||
</group>
|
||||
<group col="3" string="基本信息">
|
||||
<group>
|
||||
<field name="contract_code"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="contract_date"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="contract_type"/>
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="company_id"/>
|
||||
<field name="lessee_id"/>
|
||||
<field name="users_id" readonly="1" invisible="1"/>
|
||||
<field name="department_id" invisible="1"/>
|
||||
<field name="name" required="1"/>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="物业列表">
|
||||
<field name="lease_ids" string=" ">
|
||||
@@ -86,14 +105,6 @@
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
<group string="基本信息">
|
||||
<field name="contract_code"/>
|
||||
<field name="company_id"/>
|
||||
<field name="lessee_id"/>
|
||||
<field name="users_id" readonly="1"/>
|
||||
<field name="department_id" invisible="1"/>
|
||||
<field name="name" required="1"/>
|
||||
</group>
|
||||
<group col="3" string="承租方个人信息">
|
||||
<group>
|
||||
<field name="contact"/>
|
||||
@@ -111,14 +122,13 @@
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="contract_time" invisible="1"/>
|
||||
<field name="property_documents_ids" widget="many2many_tags" invisible="1">
|
||||
<tree>
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</group>
|
||||
<group col="2" string="租凭期限">
|
||||
<group col="2" string="租赁期限">
|
||||
<group>
|
||||
<label for="lease_term_year"/>
|
||||
<div class="d-inline-flex w-100">
|
||||
@@ -148,33 +158,40 @@
|
||||
</group>
|
||||
<group col="2" string="收费详细">
|
||||
<group>
|
||||
<label for="rent_free_period_year"/>
|
||||
<label for="rent_free_period_month"/>
|
||||
<div class="d-inline-flex w-100">
|
||||
<field name="rent_free_period_year"/>
|
||||
年
|
||||
<field name="rent_free_period_month"/>
|
||||
月
|
||||
<field name="rent_free_period_days"/>
|
||||
日
|
||||
</div>
|
||||
<field name="first_years_begin"/>
|
||||
<field name="increments_every_few_years"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="total_contract_receivables"/>
|
||||
</group>
|
||||
</group>
|
||||
<group>
|
||||
<field name="first_years_begin"/>
|
||||
<field name="increments_every_few_years"/>
|
||||
<field name="increment_method"/>
|
||||
<field name="increment_percentage" invisible="increment_method != 'percentage'"/>
|
||||
<field name="increment_price" invisible="increment_method != 'increment_price'"/>
|
||||
<field name="increment_amount" invisible="increment_method != 'increment_amount'"/>
|
||||
</group>
|
||||
<group col="2">
|
||||
<group>
|
||||
<field name="admin_id" invisible="1"/>
|
||||
<field name="increment_method"/>
|
||||
<field name="increment_percentage" invisible="increment_method != 'percentage'"/>
|
||||
<field name="increment_price" invisible="increment_method != 'increment_price'"/>
|
||||
<field name="increment_amount" invisible="increment_method != 'increment_amount'"/>
|
||||
<field name="is_water" invisible="1"/>
|
||||
<field name="is_electricity" invisible="1"/>
|
||||
<field name="is_mange" invisible="1"/>
|
||||
<field name="performance_bonds_write" invisible="1"/>
|
||||
<field name="is_deposit"/>
|
||||
<field name="deposit" invisible="not is_deposit" string=" "/>
|
||||
<field name="is_performance_bonds"/>
|
||||
<field name="performance_bonds" invisible="not is_performance_bonds" string=" "/>
|
||||
<field name="deposit_type" widget="radio"/>
|
||||
<field name="deposit" invisible="deposit_type != 'deposit'" string=" "/>
|
||||
<field name="performance_bonds" invisible="deposit_type != 'performance' " string=" "/>
|
||||
<field name="first_year_rent"/>
|
||||
<field name="rent"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="total_contract_receivables"/>
|
||||
<field name="tax_rate"/>
|
||||
<field name="unit_price"/>
|
||||
<field name="tax"/>
|
||||
@@ -223,24 +240,6 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- <record id="property_lease_contract_search" model="ir.ui.view">-->
|
||||
<!-- <field name="name">property.lease.contract.search</field>-->
|
||||
<!-- <field name="model">property.lease.contract.type</field>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <search>-->
|
||||
<!-- 所属公司，权属人，片区，物业信息-->
|
||||
<!-- <field name="company_id"/> 禁用company_id -->
|
||||
<!-- <field name="company_id"/>-->
|
||||
<!-- <field name="company_id"/>-->
|
||||
<!-- <searchpanel>-->
|
||||
<!-- <field name="decision_type_id"/>-->
|
||||
<!-- <field name="decision_type_id"/>-->
|
||||
<!-- <field name="decision_type_id"/>-->
|
||||
<!-- </searchpanel>-->
|
||||
<!-- </search>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
|
||||
<record id="property_lease_contract_action" model="ir.actions.act_window">
|
||||
<field name="name">租赁合同审批</field>
|
||||
<field name="res_model">property.lease.contract</field>
|
||||
|
||||
@@ -67,6 +67,7 @@ class PropertyContractWizard(models.Model):
|
||||
percentage_liquidated_damages = self.env['yuthon.penalty.setting'].create({'name': row[36].value})
|
||||
tax = row[40].value
|
||||
date_payment_day = row[37].value
|
||||
performance_bonds = row[40].value
|
||||
contract_date = {
|
||||
'name': name,
|
||||
'admin_id': admin_id.id,
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
<tree string='日程' editable="bottom"
|
||||
decoration-danger="priority == 'very_urgent'"
|
||||
decoration-info="priority == 'urgent'"
|
||||
decoration-muted = "state == 'cancel'"
|
||||
decoration-primary="priority == 'general'"
|
||||
decoration-success="priority == 'important'">
|
||||
<field name='start_time' required="1"/>
|
||||
<field name='task_content' required="1"/>
|
||||
|
||||
Reference in New Issue
Block a user