odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[imp] event : remove unused code. 

bzr revid: nco@tinyerp.com-20120427094634-foba34c88a4mn2ja
This commit is contained in:
Nimesh (Open ERP) 2012-04-27 15:16:34 +05:30
parent fa10c5cec7
commit 66814b5501
4 changed files with 26 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/event/event.py
View File

@ -220,7 +220,7 @@ class event_event(osv.osv):
'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}), 'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}), 'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'), 'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
'location_id': fields.many2one('res.company','Location Address', readonly=False, states={'done': [('readonly', True)]}), 'location_id': fields.many2one('res.company','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
} }

63
addons/event/event_view.xml
View File

@ -103,50 +103,33 @@
</div> </div>
<newline/> <newline/>
<group colspan="4" string="vanue"> <group colspan="4" string="vanue">
<div class="sub1"> Venue : </div> <separator orientation="vertical"/> <div class="oe_sub1"> Venue : </div> <separator orientation="vertical"/>
<field name="location_id" nolabel="1"/> <field name="location_id" nolabel="1"/>
</group> </group>
</group> </group>
<group> <group>
<div class="mapbox"> </div><newline/> <div class="oe_mapbox"> </div><newline/>
<!--table> <table>
<tr> <tr>
<td width="70px" style="text-align:top;" class="oe_td_border"> <td width="70px" class="oe_td_border">
Where Where
</td> </td>
<td width="150px"> <td width="150px">
<field name="address_id" nolabel="1"/> <field name="address_id" nolabel="1"/>
</td>
</td> <td width="auto">
<td width="150px"> <table>
<span width="15px"> Start</span> <field name="date_begin" nolabel="1"/> <tr>
<span width="15px"> End</span> <field name="date_end" nolabel="1"/> <td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
</td> </tr>
</tr> <tr>
</table--> <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
<table> </tr>
<tr> </table>
<td width="70px" class="oe_td_border">
Where </td>
</td> </tr>
<td width="150px"> </table>
<field name="address_id" nolabel="1"/>
</td>
<td width="auto">
<table>
<tr>
<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
</tr>
<tr>
<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
</tr>
</table>
</td>
</tr>
</table>
<!--field name="date_end" label="To" string="end"/-->
</group> </group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">

9
addons/event/static/src/css/event.css
View File

@ -122,16 +122,11 @@ div.oe_fold_column{
.oe_event_title{ .oe_event_title{
font-size: 25px; font-size: 25px;
} }
.sub1 .oe_sub1
{ {
float:left; float:left;
} }
.sub2 .oe_mapbox
{
padding-left:50px;
text-align:left;
}
.mapbox
{ {
width:380px; width:380px;
height:200px; height:200px;

3
addons/event_sale/__openerp__.py
View File

@ -39,10 +39,7 @@ It defines a new kind of service products that offers you the possibility to cho
'event_sale_view.xml', 'event_sale_view.xml',
], ],
'demo_xml': ['event_demo.xml'], 'demo_xml': ['event_demo.xml'],
'js': ['static/src/js/*.js'],
'html': ['static/*.html'],
'test':['test/confirm.yml'], 'test':['test/confirm.yml'],
'css': ['static/src/css/*.css'],
'installable': True, 'installable': True,
'active': False, 'active': False,
} }