Merge lp:~jb.eficent/department-mgmt/department-mgmt-bugfixes_analytic into lp:~department-core-editors/department-mgmt/7.0

[JB (eficent.com)]

Fixes bugs 1296119, 1296109

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Jordi,

Thanks for the contribution. Some questions about your MP:

- Why do you need _get_department method? If you put a related field, this method is not needed.
- Is it possible that you link a different department for the same account_id? If it's so, related field is not the best approach.

Regards.

review: Needs Information (code review)

[Daniel Reis (dreis-pt)]

I agree with Pedro. It would be best to keep department_id as a plain many2one, and instead have a default value for it.

[Daniel Reis (dreis-pt)]

review: Needs Fixing

[JB (eficent.com) (jb.eficent)]

I first tried to use a default and call the _get_department (and left it there inconsciously), but found that I was not able to retrieve the analytic account's department from there. Not passed in the context. Any idea how can it be fetched?
I think it's not good idea to fetch it again from the employee.
I I would not like to change the logic of the programs that create the analytic line either.

Thanks for your feedback! Very valuable...

Jordi

[Daniel Reis (dreis-pt)]

Maybe extending the create() method - if department_id is empty, it could be found and filled after the super() call.

[lp:~jb.eficent/department-mgmt/department-mgmt-bugfixes_analytic]

19. By JB (eficent.com) on 2014-03-26

Defaults department in analytic line during create, based on the department of the analytic account.

[JB (eficent.com) (jb.eficent)]

Now corrected as per your suggestions. Thanks!

Regards,
Jordi.

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

As suggested in the MP related to task's department (https://code.launchpad.net/~camptocamp/department-mgmt/add-dep-on-project-task-jge/+merge/217068) I think we have 2 important informations in analytic line,.

 * The first one is the user's employee related department
 * The second is the analytic account's related department

Both information are valuable, depending on what you want to know. In my use case, the department_id of the line is fulfill by the employee's department through timesheet lines mostely.

I suggest here a way of dealing with this, basically:

 * department_id is the user's related department, given by a default value calling _get_department
 * A new field called account_department_id is a field.related on the analytic account department_id
 * Adapt all search, group and tree view

Here is my proposal:

https://code.launchpad.net/~camptocamp/department-mgmt/add-account-department-fix-default-anyltic-jge/+merge/218807

So, I mark "needs infos".

Regards,

Joël

review: Needs Information (code review + test)

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

As this MP :https://code.launchpad.net/~camptocamp/department-mgmt/add-account-department-fix-default-anyltic-jge/+merge/218807

Has been merged, I mark this one as disapproved. Reply in there if anything wrong with that.

Regards,

Joël

review: Disapprove (code review + test)

Unmerged revisions

19. By JB (eficent.com) on 2014-03-26

Defaults department in analytic line during create, based on the department of the analytic account.

18. By JB (eficent.com) on 2014-03-22

Fixes bugs #1296119, #1296109 on analytic_department

=== modified file 'analytic_department/__openerp__.py'
--- analytic_department/__openerp__.py	2013-03-04 16:36:08 +0000
+++ analytic_department/__openerp__.py	2014-03-26 10:06:58 +0000
@@ -10,6 +10,6 @@
 corresponding tree, search and form  views.
 """,
     "website": "http://camptocamp.com",
-    "depends": ["account", "hr"],
+    "depends": ["account", "hr", "analytic"],
     "data": ["analytic_view.xml"],
 }

=== modified file 'analytic_department/analytic.py'
--- analytic_department/analytic.py	2013-03-04 16:36:08 +0000
+++ analytic_department/analytic.py	2014-03-26 10:06:58 +0000
@@ -11,6 +11,26 @@
 
 class AnalyticLine(orm.Model):
     _inherit = "account.analytic.line"
+                
     _columns = {
         'department_id': fields.many2one('hr.department', 'Department'),
     }
+    
+    def create(self, cr, uid, vals, context=None):
+        """ Updates the analytic line with the account's department 
+        by default """
+        if context is None:
+            context = {}
+            
+        analytic_obj = self.pool.get('account.analytic.account')
+        analytic_line_obj = self.pool.get('account.analytic.line')
+        
+        if vals['account_id']:                        
+            account = analytic_obj.browse(cr, uid, vals['account_id'], 
+                                              context=context)            
+            department_id = None
+            if account.department_id:
+                vals['department_id'] = account.department_id.id
+                
+        return super(AnalyticLine, self).create(cr, uid, vals, context)
+                
\ No newline at end of file

=== modified file 'analytic_department/analytic_view.xml'
--- analytic_department/analytic_view.xml	2013-03-04 16:36:08 +0000
+++ analytic_department/analytic_view.xml	2014-03-26 10:06:58 +0000
@@ -27,6 +27,17 @@
             </field>
         </record>
         
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <field name="code" position="after">
+                    <field name="department_id"/>
+                </field>
+            </field>
+        </record>        
+        
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
             <field name="model">account.analytic.line</field>