[MERGE] fix lp:689577

bzr revid: tfr@openerp.com-20110517153102-qlec7u7elsvgw1jk
This commit is contained in:
tfr@openerp.com
2011-05-17 17:31:02 +02:00
2 changed files with 38 additions and 0 deletions
+8
View File
@@ -32,6 +32,7 @@ CRM_CLAIM_PENDING_STATES = (
crm.AVAILABLE_STATES[4][0], # Pending
)
class crm_claim(crm.crm_case, osv.osv):
"""
Crm claim
@@ -265,6 +266,13 @@ class crm_claim(crm.crm_case, osv.osv):
crm_claim()
class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
}
res_partner()
class crm_stage_claim(osv.osv):
+30
View File
@@ -306,6 +306,36 @@
</field>
</record>
<record id="base.view_crm_partner_info_History1" model="ir.ui.view">
<field name="name">res.partner.crm.history.inherit1</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
</field>
</record>
<record id="view_claim_partner_info_form1" model="ir.ui.view">
<field name="name">res.partner.claim.info.form</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="priority">20</field>
<field name="arch" type="xml">
<data>
<xpath expr="/form/notebook/page[@string='History']" position="inside">
<field name="claims_ids" colspan="4" nolabel="1">
<tree string="Partners Claim" editable="bottom">
<field name="name"/>
</tree>
</field>
</xpath>
</data>
</field>
</record>
<act_window
context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
id="act_claim_partner"