Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] Remove model_description field since it's not useful in v8

pull/139/head
Agathe Mollé 2015-06-22 16:17:12 -04:00 committed by Alejandro Santana
parent 4b6dd9991a
commit bcc698d158
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
super_calendar/models/super_calendar.py
View File

@ -131,7 +131,6 @@ class SuperCalendarConfigurator(models.Model):
super_calendar_values = { super_calendar_values = {
'name': name, 'name': name,
'model_description': line.description,
'date_start': cur_rec[f_date_start], 'date_start': cur_rec[f_date_start],
'duration': duration, 'duration': duration,
'user_id': ( 'user_id': (
@ -156,11 +155,6 @@ class SuperCalendarConfiguratorLine(models.Model):
string='Model', string='Model',
required=True, required=True,
) )
description = fields.Char(
string='Description',
size=128,
required=True,
)
domain = fields.Char( domain = fields.Char(
string='Domain', string='Domain',
size=512, size=512,
@ -217,11 +211,6 @@ class SuperCalendar(models.Model):
size=512, size=512,
required=True, required=True,
) )
model_description = fields.Char(
string='Model Description',
size=128,
required=True,
)
date_start = fields.Datetime( date_start = fields.Datetime(
string='Start date', string='Start date',
required=True, required=True,

6
super_calendar/views/super_calendar_view.xml
View File

@ -24,14 +24,12 @@
<field name="line_ids" nolabel="1" colspan="4"> <field name="line_ids" nolabel="1" colspan="4">
<tree string="Lines"> <tree string="Lines">
<field name="name"/> <field name="name"/>
<field name="description"/>
<field name="domain"/> <field name="domain"/>
</tree> </tree>
<form string="Line"> <form string="Line">
<group> <group>
<group> <group>
<field name="name"/> <field name="name"/>
<field name="description"/>
<field name="domain"/> <field name="domain"/>
<field name="user_field_id"/> <field name="user_field_id"/>
</group> </group>
@ -80,7 +78,6 @@
<field name="user_id"/> <field name="user_id"/>
<field name="configurator_id"/> <field name="configurator_id"/>
<field name="model_id"/> <field name="model_id"/>
<field name="model_description"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -98,7 +95,6 @@
<field name="user_id" readonly="1"/> <field name="user_id" readonly="1"/>
<field name="configurator_id" readonly="1"/> <field name="configurator_id" readonly="1"/>
<field name="model_id" readonly="1"/> <field name="model_id" readonly="1"/>
<field name="model_description" readonly="1"/>
<field name="res_id" readonly="1"/> <field name="res_id" readonly="1"/>
</group> </group>
</sheet> </sheet>
@ -111,7 +107,6 @@
<field name="model">super.calendar</field> <field name="model">super.calendar</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<calendar string="Calendar" color="model_id" date_start="date_start" date_delay="duration" quick_add="false"> <calendar string="Calendar" color="model_id" date_start="date_start" date_delay="duration" quick_add="false">
<!--The color attribute should be: model_description but v8 calendars require many2one fields-->
<field name="name"/> <field name="name"/>
</calendar> </calendar>
</field> </field>
@ -125,7 +120,6 @@
<field name="name"/> <field name="name"/>
<field name="configurator_id" select="1"/> <field name="configurator_id" select="1"/>
<field name="model_id" select="1"/> <field name="model_id" select="1"/>
<field name="model_description" select="1"/>
<field name="user_id" widget="selection" > <field name="user_id" widget="selection" >
<filter domain="[('user_id','=',uid)]" help="My Items" icon="terp-personal"/> <filter domain="[('user_id','=',uid)]" help="My Items" icon="terp-personal"/>
</field> </field>