[MERGE] Merge Team3 work from addons3 branch

bzr revid: mra@mra-laptop-20100702144503-0yynbrlkxn0v76lt

3 files changed, 16 insertions, 12 deletions

diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index 6fd6bebfe6c..7f2d124f8b8 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -25,22 +25,22 @@
     'name': 'Add the Timesheet support for Issue Management in Project Management',
     'version': '1.0',
     'category': 'Generic Modules/CRM & SRM',
-    'description': """
-        This module adds the Timesheet support for the Issues/Bugs Management in Project
-    """,
+    'description': """ 
+                    This module adds the Timesheet support for the Issues/Bugs Management in Project
+                """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': [
         'project_issue',
         'hr_timesheet_sheet',
-    ],
+        ],
     'init_xml': [
-    ],
+        ],
     'update_xml': [
         'project_issue_sheet_view.xml',
-     ],
+        ],
     'demo_xml': [
-    ],
+        ],
     'installable': True,
     'active': False,
 }
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 4027dab3572..99d08c51f2d 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -24,25 +24,30 @@ from tools.translate import _
 
 class project_issue(osv.osv):
     _inherit = 'project.issue'
+    _description = 'project issue'
     _columns = {
-        'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
-        'analytic_account_id': fields.related('project_id','category_id',string='Analytic Account')
+        'timesheet_ids': fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
+        'analytic_account_id': fields.related('project_id', 'category_id', string='Analytic Account')
     }
 project_issue()
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
-
+    _description = 'account analytic line'
     _columns = {
         'create_date' : fields.datetime('Create Date', readonly=True),
-    }
+                }
 
 account_analytic_line()
 
 class hr_analytic_issue(osv.osv):
+
     _inherit = 'hr.analytic.timesheet'
+    _description = 'hr analytic timesheet'
     _columns = {
         'issue_id' : fields.many2one('project.issue', 'Issue'),
     }
+
 hr_analytic_issue()
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 12171d0a429..fbc1dccc2ed 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -17,7 +17,6 @@
                                 <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
-
                                 <field invisible="1" name="journal_id"/>
                                 <field invisible="1" name="product_id"/>
                                 <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>