Merge lp:~openerp-dev/openobject-addons/trunk-bug-689577-asr into lp:openobject-addons

[Ashutosh Srivastava(Open ERP)]

[Bhumika Shrimali (sbh-openerp)]

Remove unused space and set proper format in xml .

review: Needs Fixing

=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py	2011-03-16 12:38:21 +0000
+++ crm_claim/crm_claim.py	2011-05-17 08:55:35 +0000
@@ -32,6 +32,7 @@
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
+
 class crm_claim(crm.crm_case, osv.osv):
     """
     Crm claim
@@ -265,6 +266,13 @@
 
 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):
     

=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2011-04-14 10:35:37 +0000
+++ crm_claim/crm_claim_view.xml	2011-05-17 08:55:35 +0000
@@ -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"