From 78000800c3f7c6965a2a167cd36578c8d4bfbec3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 12 May 2010 19:35:35 +0530
Subject: [PATCH] [IMP]: partner_infotab: Renamed partner_crm to
 partner_infotab, Made relation with timesheet lines and partner

bzr revid: rpa@tinyerp.com-20100512140535-cu62e5qzbiy1vvyp
---
 addons/hr_timesheet/hr_timesheet.py           |  3 ++-
 .../__init__.py                               |  2 +-
 .../__openerp__.py                            |  4 ++--
 .../partner_infotab.py}                       |  2 ++
 .../partner_infotab_view.xml}                 | 22 +++++++++----------
 .../security/ir.model.access.csv              |  0
 6 files changed, 18 insertions(+), 15 deletions(-)
 rename addons/{partner_crm => partner_infotab}/__init__.py (97%)
 rename addons/{partner_crm => partner_infotab}/__openerp__.py (94%)
 rename addons/{partner_crm/partner_crm.py => partner_infotab/partner_infotab.py} (91%)
 rename addons/{partner_crm/partner_crm_view.xml => partner_infotab/partner_infotab_view.xml} (61%)
 rename addons/{partner_crm => partner_infotab}/security/ir.model.access.csv (100%)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index e89d52659f4..25c61483391 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -43,7 +43,8 @@ class hr_analytic_timesheet(osv.osv):
     _inherits = {'account.analytic.line': 'line_id'}
     _order = "id desc"
     _columns = {
-        'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'),
+        'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'), 
+        'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id',relation='account.analytic.account',store=True),
     }
 
     def unlink(self, cr, uid, ids, context={}):
diff --git a/addons/partner_crm/__init__.py b/addons/partner_infotab/__init__.py
similarity index 97%
rename from addons/partner_crm/__init__.py
rename to addons/partner_infotab/__init__.py
index 4dd1f496527..a0a034ec9c5 100644
--- a/addons/partner_crm/__init__.py
+++ b/addons/partner_infotab/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import partner_crm
+import partner_infotab
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/partner_crm/__openerp__.py b/addons/partner_infotab/__openerp__.py
similarity index 94%
rename from addons/partner_crm/__openerp__.py
rename to addons/partner_infotab/__openerp__.py
index d5bc49b1e5c..db44ac70762 100644
--- a/addons/partner_crm/__openerp__.py
+++ b/addons/partner_infotab/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Detailed info on partner form', 
+    'name': 'Detailed information on partner form', 
     'version': '1.0', 
     'category': 'Generic Modules/Base', 
     'description': """
@@ -44,7 +44,7 @@ It adds the following fields on the partner form:
     'init_xml': [], 
     'update_xml': [
                    'security/ir.model.access.csv', 
-                   'partner_crm_view.xml'
+                   'partner_infotab_view.xml'
                    ], 
     'demo_xml': [], 
     'installable': True, 
diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_infotab/partner_infotab.py
similarity index 91%
rename from addons/partner_crm/partner_crm.py
rename to addons/partner_infotab/partner_infotab.py
index 2162f850115..f448919c2ea 100644
--- a/addons/partner_crm/partner_crm.py
+++ b/addons/partner_infotab/partner_infotab.py
@@ -33,6 +33,8 @@ class res_partner(osv.osv):
                 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'), 
                 'contract_ids': fields.one2many('account.analytic.account', \
                                                     'partner_id', 'Contracts'), 
+                'account_line_ids': fields.one2many('hr.analytic.timesheet', \
+                                                    'partner_id', 'Anaylitic account lines '),
                 }
 
 res_partner()
diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_infotab/partner_infotab_view.xml
similarity index 61%
rename from addons/partner_crm/partner_crm_view.xml
rename to addons/partner_infotab/partner_infotab_view.xml
index ab75f5c58ed..8aabbb242e9 100644
--- a/addons/partner_crm/partner_crm_view.xml
+++ b/addons/partner_infotab/partner_infotab_view.xml
@@ -11,19 +11,19 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                	<page string="Other Info">
-                		<group col="2" colspan="4">							
-							<field name="opportunity_ids" colspan="4" nolabel="1" />							
-							<field name="meeting_ids" colspan="4" nolabel="1" />							
+                	<page string="CRM Info">
+							<field name="opportunity_ids" colspan="4" nolabel="1" />
+							<field name="meeting_ids" colspan="4" nolabel="1" />
 							<field name="phonecall_ids" colspan="4" nolabel="1" />
-                		</group>
-                		<group col="2" colspan="4">							
-							<field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
-						</group>
-						<group col="2" colspan="4">							
-							<field name="contract_ids" colspan="4" nolabel="1" />
-						</group>
 					</page>
+
+					<page string="Other Info">
+							<field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
+							<field name="contract_ids" colspan="4" nolabel="1"/>
+						    <field name="account_line_ids" colspan="4" nolabel="1" context="{'group_by':'date'}"/>
+
+					</page>
+
                 </notebook>
             </field>
         </record>
diff --git a/addons/partner_crm/security/ir.model.access.csv b/addons/partner_infotab/security/ir.model.access.csv
similarity index 100%
rename from addons/partner_crm/security/ir.model.access.csv
rename to addons/partner_infotab/security/ir.model.access.csv