Merge pull request #2362 from expsa/manar_dev_realstate_12_2
UPDATE real_estate
This commit is contained in:
commit
39526a07c5
|
|
@ -737,6 +737,11 @@ msgstr "هل عدد الوحدات ثابت في الأدوار؟"
|
||||||
msgid "Is Waqf"
|
msgid "Is Waqf"
|
||||||
msgstr "هل وقف"
|
msgstr "هل وقف"
|
||||||
|
|
||||||
|
#. module: real_estate
|
||||||
|
#: model:ir.model.fields,field_description:real_estate.field_internal_property_type__is_owned
|
||||||
|
msgid "Is Owned"
|
||||||
|
msgstr "هل ملك"
|
||||||
|
|
||||||
#. module: real_estate
|
#. module: real_estate
|
||||||
#: model:ir.model.fields,field_description:real_estate.field_re_unit__journal_id
|
#: model:ir.model.fields,field_description:real_estate.field_re_unit__journal_id
|
||||||
msgid "Journal"
|
msgid "Journal"
|
||||||
|
|
@ -2074,3 +2079,8 @@ msgstr ""
|
||||||
#: model:ir.model.constraint,message:real_estate.constraint_internal_property_type_type
|
#: model:ir.model.constraint,message:real_estate.constraint_internal_property_type_type
|
||||||
msgid "نوع العقار يجب ان لا يتكرر"
|
msgid "نوع العقار يجب ان لا يتكرر"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#. module: real_estate
|
||||||
|
#: model:ir.model.fields,field_description:real_estate.field_internal_property__percentage_owned
|
||||||
|
msgid "Percentage Owned"
|
||||||
|
msgstr "النسبة المملوكة"
|
||||||
|
|
@ -257,6 +257,8 @@ class Property(models.Model):
|
||||||
bathroom_no = fields.Integer(string="Bathroom Count", compute="get_unit_info", store=True)
|
bathroom_no = fields.Integer(string="Bathroom Count", compute="get_unit_info", store=True)
|
||||||
hall_no = fields.Integer(string="Hall Count", compute="get_unit_info", store=True)
|
hall_no = fields.Integer(string="Hall Count", compute="get_unit_info", store=True)
|
||||||
kitchen_no = fields.Integer(string="kitchen Count", compute="get_unit_info", store=True)
|
kitchen_no = fields.Integer(string="kitchen Count", compute="get_unit_info", store=True)
|
||||||
|
percentage_owned = fields.Float('Percentage Owned')
|
||||||
|
is_owned = fields.Boolean(related='property_type_id.is_owned')
|
||||||
|
|
||||||
# _sql_constraints = [
|
# _sql_constraints = [
|
||||||
# ('stamping', 'unique(stamping)', _('Stamping must be unique.')),
|
# ('stamping', 'unique(stamping)', _('Stamping must be unique.')),
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ class PropertyType(models.Model):
|
||||||
company_id = fields.Many2one('res.company', string='Company',
|
company_id = fields.Many2one('res.company', string='Company',
|
||||||
default=lambda self: self.env.user.company_id)
|
default=lambda self: self.env.user.company_id)
|
||||||
is_waqf = fields.Boolean('Is Waqf')
|
is_waqf = fields.Boolean('Is Waqf')
|
||||||
|
is_owned = fields.Boolean('Is Owned')
|
||||||
|
|
||||||
_sql_constraints = [
|
_sql_constraints = [
|
||||||
('type', 'unique(name)', _('Property type must be unique.')),
|
('type', 'unique(name)', _('Property type must be unique.')),
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,10 @@
|
||||||
attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
|
attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
|
||||||
<field name="property_type_id" required="1"
|
<field name="property_type_id" required="1"
|
||||||
attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
|
attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)]}"/>
|
||||||
|
<field name="is_owned" invisible="1"/>
|
||||||
|
<field name="percentage_owned"
|
||||||
|
attrs="{'readonly':[('state','!=','draft'),('unlock','=',True)],'invisible':[('is_owned','=',False)]}" widget="percentage"/>
|
||||||
|
|
||||||
<field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
|
<field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
|
||||||
name="company_profit" invisible="1"/>
|
name="company_profit" invisible="1"/>
|
||||||
<field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
|
<field attrs="{'readonly':[('state','=','approve'),('unlock','=',True)]}"
|
||||||
|
|
|
||||||
|
|
@ -67,6 +67,7 @@
|
||||||
<field name="market_type" invisible="1" required="0"/>
|
<field name="market_type" invisible="1" required="0"/>
|
||||||
<field name="name" required="1"/>
|
<field name="name" required="1"/>
|
||||||
<field name="is_waqf" required="1"/>
|
<field name="is_waqf" required="1"/>
|
||||||
|
<field name="is_owned"/>
|
||||||
<field name="is_land" invisible="1"/>
|
<field name="is_land" invisible="1"/>
|
||||||
<field name="company_id" groups="base.group_multi_company"/>
|
<field name="company_id" groups="base.group_multi_company"/>
|
||||||
</group>
|
</group>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue