[IMP] change as per review
bzr revid: kjo@tinyerp.com-20120705120611-mavp52c52psenqiw
This commit is contained in:
parent
db41f516f2
commit
62e79c8401
|
@ -9,7 +9,7 @@
|
|||
parent="base.menu_base_partner" sequence="8" />
|
||||
|
||||
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
|
||||
<field name="name">Funds</field>
|
||||
<field name="name">Fund Raising</field>
|
||||
<field name="res_model">crm.fundraising</field>
|
||||
<field name="view_mode">tree,form,graph</field>
|
||||
<field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<button name="import_all" string="_Import"
|
||||
type="object" class="oe_highlight"/>
|
||||
<button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
|
||||
type="object" class="oe_highlight" />
|
||||
type="object" class="oe_highlight" /> or
|
||||
<button special="cancel" string="_Cancel" class="oe_link"/>
|
||||
</header>
|
||||
<sheet>
|
||||
|
|
|
@ -315,11 +315,11 @@ class Partner(osv.osv):
|
|||
return self._membership_state(*args, **kwargs)
|
||||
|
||||
_columns = {
|
||||
'associate_member': fields.many2one('res.partner', 'Associate member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
|
||||
'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
|
||||
'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
|
||||
'free_member': fields.boolean('Free member', help = "Select if you want to give membership free of cost."),
|
||||
'free_member': fields.boolean('Free Member', help = "Select if you want to give membership free of cost."),
|
||||
'membership_amount': fields.float(
|
||||
'Membership amount', digits=(16, 2),
|
||||
'Membership Amount', digits=(16, 2),
|
||||
help = 'The price negotiated by the partner'),
|
||||
'membership_state': fields.function(
|
||||
__get_membership_state,
|
||||
|
@ -338,7 +338,7 @@ class Partner(osv.osv):
|
|||
-Paid Member: A member who has paid the membership amount."""),
|
||||
'membership_start': fields.function(
|
||||
_membership_date, multi = 'membeship_start',
|
||||
string = 'Start membership date', type = 'date',
|
||||
string = 'Start Membership Date', type = 'date',
|
||||
store = {
|
||||
'account.invoice': (_get_invoice_partner, ['state'], 10),
|
||||
'membership.membership_line': (_get_partner_id, ['state'], 10, ),
|
||||
|
@ -346,7 +346,7 @@ class Partner(osv.osv):
|
|||
}, help="Date from which membership becomes active."),
|
||||
'membership_stop': fields.function(
|
||||
_membership_date,
|
||||
string = 'Stop membership date', type='date', multi='membership_stop',
|
||||
string = 'Stop Membership Date', type='date', multi='membership_stop',
|
||||
store = {
|
||||
'account.invoice': (_get_invoice_partner, ['state'], 10),
|
||||
'membership.membership_line': (_get_partner_id, ['state'], 10),
|
||||
|
@ -354,7 +354,7 @@ class Partner(osv.osv):
|
|||
}, help="Date until which membership remains active."),
|
||||
'membership_cancel': fields.function(
|
||||
_membership_date,
|
||||
string = 'Cancel membership date', type='date', multi='membership_cancel',
|
||||
string = 'Cancel Membership Date', type='date', multi='membership_cancel',
|
||||
store = {
|
||||
'account.invoice': (_get_invoice_partner, ['state'], 11),
|
||||
'membership.membership_line': (_get_partner_id, ['state'], 10),
|
||||
|
|
|
@ -164,10 +164,12 @@
|
|||
<label for="date_start" string="Duration"/>
|
||||
<div>
|
||||
<div>
|
||||
<field name="duration" class="oe_inline"/>
|
||||
<field name="product_uom" class="oe_inline"/>
|
||||
<field name="date_start" class="oe_inline"/>
|
||||
<label string=" - " class="oe_inline oe_edit_only"/>
|
||||
<field name="date_end" class="oe_inline"/>
|
||||
</div>
|
||||
<field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/>
|
||||
<field name="duration" class="oe_inline"/>
|
||||
<field name="product_uom" class="oe_inline"/>
|
||||
</div>
|
||||
</group>
|
||||
<notebook>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_wiki_test">
|
||||
<field name="name">Wiki Pages</field>
|
||||
<field name="name">Sales FAQ</field>
|
||||
<field name="res_model">wiki.wiki</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
|
|
Loading…
Reference in New Issue