[FIX] revert code to get analytic account on project issue

bzr revid: nel@tinyerp.com-20100503122559-risp0gdr24cspvy5

diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index b990142..2bf67d4 100644 (file)
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -33,6 +33,7 @@
     'depends': [
         'crm',
         'project',
+        'hr_timesheet_sheet',
     ],
     'init_xml': [
         'project_issue_data.xml'

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 3bf0bf3..74ca762 100644 (file)
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -128,6 +128,10 @@ class project_issue(osv.osv):
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 method=True, multi='day_close', type="integer", store=True),
         'assigned_to' : fields.many2one('res.users', 'Assigned to'),
+        'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'issue_id', 'Timesheets'),
+        'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account',
+                                                domain="[('partner_id', '=', partner_id)]",
+                                                required=True),
     }
 
     def _get_project(self, cr, uid, context):
@@ -220,3 +224,20 @@ class project_issue(osv.osv):
 
 project_issue()
 
+class account_analytic_line(osv.osv):
+    _inherit = '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'
+
+    _columns = {
+        'issue_id' : fields.many2one('project.issue', 'Issue'),
+    }
+
+hr_analytic_issue()
+

diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 7c7764a..8794992 100644 (file)
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -18,6 +18,7 @@
                <field name="categ_id" ref="bug_categ"/>
                <field name="stage_id" ref="stage1"/>
                <field name="project_id" ref="project.project_project_22"/>
+               <field name="analytic_account_id" ref="account.analytic_agrolait"/>
                <field eval="15.0" name="duration"/>
                <field eval="&quot;Bug in Accounts module&quot;" name="name"/>
                <field eval="&quot;agr@agrolait.com&quot;" name="email_from"/>
@@ -37,6 +38,7 @@
                <field eval="&quot;3&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_asus"/>
+               <field name="analytic_account_id" ref="account.analytic_asustek"/>
                <field eval="&quot;done&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -53,6 +55,8 @@
                <field name="type_id" ref="type1"/>
                <field eval="&quot;4&quot;" name="priority"/>
                <field name="user_id" ref="base.user_demo"/>
+               <field name="partner_id" ref="account.analytic_project_1"/>
+               <field name="analytic_account_id" ref="account.analytic_asustek"/>
                <field eval="&quot;cancel&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -70,6 +74,7 @@
                <field eval="&quot;3&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_14"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;cancel&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -86,6 +91,7 @@
                <field eval="&quot;3&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
+               <field name="analytic_account_id" ref="account.analytic_desertic_hispafuentes"/>
                <field eval="&quot;draft&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -103,6 +109,7 @@
                <field eval="&quot;3&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_5"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;pending&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -120,6 +127,7 @@
                <field eval="&quot;2&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_6"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;pending&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -137,6 +145,7 @@
                <field eval="&quot;2&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_6"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;pending&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -154,6 +163,7 @@
                <field eval="&quot;2&quot;" name="priority"/>
                <field name="user_id" ref="base.user_demo"/>
                <field name="partner_id" ref="base.res_partner_5"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;open&quot;" name="state"/>
                <field eval="1" name="active"/>
                <field eval="1.3" name="duration"/>
@@ -170,6 +180,7 @@
                <field eval="&quot;2&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_2"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;open&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -187,6 +198,7 @@
                <field eval="&quot;4&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_maxtor"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;open&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -204,6 +216,7 @@
                <field eval="&quot;1&quot;" name="priority"/>
                <field name="user_id" ref="base.user_demo"/>
                <field name="partner_id" ref="base.res_partner_9"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;done&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -222,6 +235,7 @@
                <field eval="&quot;3&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_10"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;cancel&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -242,6 +256,7 @@
                <field eval="&quot;3&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_6"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;draft&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -259,6 +274,7 @@
                <field eval="&quot;4&quot;" name="priority"/>
                <field name="user_id" ref="base.user_root"/>
                <field name="partner_id" ref="base.res_partner_11"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;pending&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>
@@ -276,6 +292,7 @@
                <field eval="&quot;2&quot;" name="priority"/>
                <field name="user_id" ref="base.user_demo"/>
                <field name="partner_id" ref="base.res_partner_11"/>
+               <field name="analytic_account_id" ref="account.analytic_project_1"/>
                <field eval="&quot;pending&quot;" name="state"/>
                <field name="section_id" ref="crm.section_sales_department"/>
                <field eval="1" name="active"/>

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0416849..343005d 100644 (file)
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -46,6 +46,7 @@
                                 <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                                 <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
                                 <field name="email_from"/>
+                                <field name="analytic_account_id" />
                             </group>
                             <group col="3" colspan="2">
                                 <separator colspan="3" string="Status"/>
@@ -131,6 +132,24 @@
                                context="{'mail':'new', 'model': 'project.issue'}"
                                icon="gtk-go-forward" type="action" />
                         </page>
+                        <page string="Worklogs">
+                            <separator string="Timesheets" colspan="4" />
+                            <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
+                                <tree editable="top" string="Timesheet">
+                                    <field name="create_date" string="Date" />
+                                    <field name="user_id" readonly="1" />
+                                    <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)"/>
+                                    <field invisible="1" name="amount"/>
+                                    <field invisible="1" name="general_account_id"/>
+                                </tree>
+                            </field>
+                        </page>
                     </notebook>
                 </form>
             </field>