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

[FIX] Layout 

bzr revid: stephane@openerp.com-20100308172016-4s6e67sa1vasdqgo
This commit is contained in:
Stephane Wirtel 2010-03-08 18:20:16 +01:00
parent c8a24fd862
commit fa8a34a438
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/auction/auction.py
View File

@ -63,7 +63,7 @@ class auction_dates(osv.osv):
return name
_columns = {
'name': fields.char('Auction date', size=64, required=True),
'name': fields.char('Auction Name', size=64, required=True),
'expo1': fields.date('First Exposition Day', required=True),
'expo2': fields.date('Last Exposition Day', required=True),
'auction1': fields.date('First Auction Day', required=True),

4
addons/event/event_view.xml
View File

@ -331,14 +331,14 @@
</record>
<record model="ir.actions.act_window" id="action_event_registration">
<field name="name">Events On Registrations</field>
<field name="name">Registration by Event</field>
<field name="res_model">report.event.registration</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
</record>
<menuitem name="Reporting" id="menu_report_event" parent="menu_marketing_event_main" sequence="20"/>
<!--<menuitem parent="menu_report_event" action="action_event_registration" id="menu_report_event_registration"/>-->
<menuitem parent="menu_event_main" action="action_event_registration" id="menu_report_event_registration" name="Registrations Per Event"/>
<menuitem parent="menu_event_main" action="action_event_registration" id="menu_report_event_registration" />
<!-- end... -->

13
addons/membership/membership_view.xml
View File

@ -97,7 +97,7 @@
<!-- MEMBERSHIP/CURRENT MEMBERS -->
<record model="ir.ui.view" id="membership_members_tree">
<field name="name">Current members</field>
<field name="name">Members</field>
<field name="model">res.partner</field>
<field name="type">tree</field>
<field name="arch" type="xml">
@ -129,10 +129,10 @@
</record>
<record model="ir.actions.act_window" id="action_membership_members">
<field name="name">Current members</field>
<field name="name">Members</field>
<field name="res_model">res.partner</field>
<field name="domain">[('membership_state','&lt;&gt;','none'),('membership_state','&lt;&gt;','canceled'),('membership_state','&lt;&gt;','old'),('membership_state','&lt;&gt;','waiting')]</field>
<field name="search_view_id" ref="view_res_partner_member_filter"/>
<field name="search_view_id" ref="view_res_partner_member_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_membership_members_view_tree">
@ -148,10 +148,7 @@
<field name="act_window_id" ref="action_membership_members"/>
</record>
<menuitem name="Current members" parent="menu_member"
id="menu_members"
sequence="2"
action="action_membership_members"/>
<menuitem name="Members" parent="menu_member" id="menu_members" sequence="2" action="action_membership_members"/>
<!-- PARTNERS -->
@ -189,7 +186,7 @@
<field name="membership_start" select="2"/>
<field name="membership_stop" select="2"/>
<field name="membership_cancel" select="2"/>
<field name="member_lines" nolabel="1" colspan="4" readonly="1">
<field name="member_lines" nolabel="1" colspan="4">
<tree string="Membership">
<field name="date_from"/>
<field name="date_to"/>