[IMP] event: Improve search view and small change in Make invoice wizard
bzr revid: psi@tinyerp.co.in-20101008105948-1qflslhcp1qla6qo
This commit is contained in:
parent
a2656467c9
commit
a186491d91
|
@ -37,7 +37,7 @@ class event_type(osv.osv):
|
|||
}
|
||||
event_type()
|
||||
|
||||
class event_event(osv.osv):
|
||||
class event_event(crm.crm_case, osv.osv):
|
||||
"""Event"""
|
||||
_name = 'event.event'
|
||||
_description = __doc__
|
||||
|
@ -246,6 +246,7 @@ class event_event(osv.osv):
|
|||
'state': 'draft',
|
||||
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
|
||||
'user_id': lambda obj, cr, uid, context: uid,
|
||||
'section_id': crm.crm_case._get_section,
|
||||
}
|
||||
|
||||
def _check_recursion(self, cr, uid, ids):
|
||||
|
|
|
@ -164,6 +164,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree string="Events" colors="red:register_min>register_current;black:register_min<=register_current">
|
||||
<field name="name" string="Name"/>
|
||||
<field name="user_id"/>
|
||||
<field name="main_speaker_id"/>
|
||||
<field name="language"/>
|
||||
<field name="type"/>
|
||||
|
@ -171,6 +172,7 @@
|
|||
<field name="date_end"/>
|
||||
<field name="register_min"/>
|
||||
<field name="register_current"/>
|
||||
<field name="section_id" invisible="context.get('invisible_section', True)"/>
|
||||
<field name="state"/>
|
||||
<button string="Confirm Event" help="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
|
||||
<button string="Cancel Event" help="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
|
||||
|
@ -231,13 +233,20 @@
|
|||
</field>
|
||||
<field name="date_begin" select="1"/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="section_id" default="context.get('section_id', False)" widget="selection" groups="base.group_extended">
|
||||
<filter icon="terp-personal+"
|
||||
context="{'invisible_section': False}"
|
||||
domain="[('section_id.user_id','=',uid)]"
|
||||
groups="base.group_extended"
|
||||
help="My Sales Team(s)"/>
|
||||
</field>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By..." colspan="4" col="12">
|
||||
<filter string="Responsible" icon="terp-personal" context="{'group_by': 'user_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Event Type" icon="terp-crm" context="{'group_by':'type'}"/>
|
||||
<filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Beginning Date" icon="terp-go-month"
|
||||
domain="[]" context="{'group_by':'date_begin'}"/>
|
||||
|
@ -254,7 +263,7 @@
|
|||
<field name="res_model">event.event</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar,graph</field>
|
||||
<field name="context">{"search_default_draft": "1"}</field>
|
||||
<field name="context">{"search_default_draft": "1", "search_default_section_id": section_id}</field>
|
||||
<field name="search_view_id" ref="view_event_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
<data>
|
||||
|
||||
<record id="base.group_marketing_manager" model="res.groups">
|
||||
<field name="name">Marketing / Manager</field>
|
||||
</record>
|
||||
|
||||
<record id="base.res_groups_email_template_admin" model="res.groups">
|
||||
<field name="name">Marketing / User</field>
|
||||
</record>
|
||||
|
@ -17,8 +17,7 @@
|
|||
<record id="base.group_sale_salesman" model="res.groups">
|
||||
<field name="name">Sales / User</field>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
|
|
|
@ -45,12 +45,9 @@ class event_make_invoice(osv.osv_memory):
|
|||
data = context and context.get('active_ids', [])
|
||||
|
||||
for event_reg in obj_event_reg.browse(cr, uid, data, context=context):
|
||||
if event_reg.state == 'draft':
|
||||
if event_reg.state in ('draft', 'done', 'cancel'):
|
||||
raise osv.except_osv(_('Warning !'),
|
||||
_("Invoice cannot be created if the registration is in draft state."))
|
||||
if event_reg.state == 'done':
|
||||
raise osv.except_osv(_('Warning !'),
|
||||
_("Invoice cannot be created if the registration is in done state."))
|
||||
_("Invoice cannot be created if the registration is in %s state.") % (event_reg.state))
|
||||
|
||||
if (not event_reg.tobe_invoiced):
|
||||
raise osv.except_osv(_('Warning !'),
|
||||
|
|
Loading…
Reference in New Issue