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 @@
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
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