devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1692 from expsa/odex25_realstate_dev 

[Add] electricity service in rental contract
This commit is contained in:
esraa8mostafa 2024-11-05 15:37:22 +02:00 committed by GitHub
parent 2bb29266fd 6e3952c9c5
commit 9cae4983aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_realstate/property_management/i18n/ar_001.po
View File

@ -1938,7 +1938,7 @@ msgstr "متسلسل"
#. module: property_management
#: model:ir.model.fields,field_description:property_management.field_rental_contract__service
msgid "Service"
msgid "Other Service"
msgstr "خدمات أخرى"
#. module: property_management

2
odex25_realstate/property_management/models/rental_contract.py
View File

@ -146,7 +146,7 @@ class RentalContract(models.Model):
# separate_service = fields.Boolean(string="Separate Service ?")
rent_type = fields.Many2one('rent.type', string="Rent Type")
space = fields.Float(string="Space", compute="get_property_unit_space", store=True)
service = fields.Selection([('fixed', 'Fixed'), ('percentage', 'Percentage')], string="Service")
service = fields.Selection([('fixed', 'Fixed'), ('percentage', 'Percentage')], string="Other Service")
service_note = fields.Char('Services Notes')
service_cost = fields.Float(string="service cost")
service_amount = fields.Float(string="service amount", compute="compute_service_amount", store=True)

23
odex25_realstate/property_management/views/rental_contract_views.xml
View File

@ -123,16 +123,20 @@
<group>
<group string="Contract Service">
<!-- <field name="separate_service"/>-->
<field name="electricity_cost"
attrs="{'readonly':[('state', '!=', 'draft')], 'required':[('service','!=',False)]}"/>
<field name="sanitation_cost"
attrs="{'readonly':[('state', '!=', 'draft')], 'required':[('service','!=',False)]}"/>
<field name="water_cost"/>
<field name="service" attrs="{'readonly':[('state','!=','draft')]}"/>
<label for="service"/>
<div>
<field name="service" attrs="{'readonly':[('state','!=','draft')]}"
class="oe_inline"/>|
<field name="service_cost"
attrs="{'readonly':[('state', '!=', 'draft')], 'required':[('service','!=',False)]}"/>
attrs="{'readonly':[('state', '!=', 'draft')], 'required':[('service','!=',False)]}"
style="width:70px !important;" class="oe_inline"/>|
<field name="service_amount" readonly="1"
class="oe_inline"/>
</div>
<field name="service_note"/>
<field name="service_amount" readonly="1"/>
<field name="electricity_cost"/>
<field name="sanitation_cost"/>
<field name="water_cost"/>
<field name="tax_id"/>
<div attrs="{'invisible': [('management_type', '!=', 'included')]}">
<field name="company_profit"
@ -193,11 +197,8 @@
<field name="name" readonly="1"/>
<field name="due_date" readonly="1"/>
<field name="amount" sum="Rent Amount" readonly="1"/>
<field name="electricity_cost" sum="Electricity Cost" readonly="1"/>
<field name="sanitation_cost" sum="Sanitation Cost" readonly="1"/>
<field name="water_cost" sum="Water Amount" readonly="1"/>
<field name="service_cost" sum="Service Amount" readonly="1"/>
<field name="service_note" readonly="1"/>
<field name="tax_id" required="1"/>
<field name="untaxed_amount" sum="Untaxed Amount" readonly="1"/>
<field name="tax_amount" sum="Tax Amount" readonly="1"/>