Merge lp:~camptocamp/department-mgmt/add-account-department-fix-default-anyltic-jge into lp:~department-core-editors/department-mgmt/7.0

[Joël Grand-Guillaume @ camptocamp]

Hi,

Add a default value for department_uid and add a new field to manage account's related department.

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

This is another suggestion/proposal against this one:

https://code.launchpad.net/~jb.eficent/department-mgmt/department-mgmt-bugfixes_analytic/+merge/212299

Regards,

Joël

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

l.21: context propagation is missing
l.25-25: indentation could be aligned
l.37: if the department of the account changes, the analytic lines won't be changed. That's maybe what is wanted though. I propose either to add triggers, either to add a comment why the departement on the analytic lines should not be changed

review: Needs Fixing

[lp:~camptocamp/department-mgmt/add-account-department-fix-default-anyltic-jge]

21. By Joël Grand-Guillaume @ camptocamp on 2014-05-12

[IMP] Add triggers on needed field (as suggested by review)
[FIX] Context propagation
[IMP] Few PEP8

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

Hi,

Thanks for the review I missed the trigger :( I corrected all the points.

Regards,

Joël

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks!
LGTM

review: Approve (code review)

[Daniel Reis (dreis-pt)]

I believe this covers the distinct user cases better than Jordi's MP.
So I would prefer for this one to be merged.
Anyway, I invited him for this review.

On the syle side, it's just a personal preference, but for:

    employee_ids = employee_obj.search(cr, uid,
                                       [('user_id','=', uid)],
                                       context=context)

I usually prefer:

    employee_ids = employee_obj.search(
        cr, uid,[('user_id','=', uid)], context=context)

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

FYI, first form doesn't comply with PEP8 indentation rule that if you put arguments of first line, you have to put vertical alignment, but the second one lacks some spaces after commas ;)

That it's marked as E128 error on flake8.

Regards.

=== modified file 'analytic_department/analytic.py'
--- analytic_department/analytic.py	2013-03-04 16:36:08 +0000
+++ analytic_department/analytic.py	2014-05-12 08:05:04 +0000
@@ -5,12 +5,60 @@
 class AnalyticAccount(orm.Model):
     _inherit = "account.analytic.account"
     _columns = {
-        'department_id': fields.many2one('hr.department', 'Department'),
+        'department_id': fields.many2one(
+            'hr.department', 
+            'Department'),
     }
 
 
 class AnalyticLine(orm.Model):
     _inherit = "account.analytic.line"
+
+    def _get_department(self, cr, uid, ids, context=None):
+        employee_obj = self.pool['hr.employee']
+        department_id = False
+        employee_ids = employee_obj.search(cr, uid, 
+                                           [('user_id','=', uid)],
+                                           context=context)
+        if employee_ids:
+            employee = employee_obj.browse(cr, uid, 
+                                           employee_ids[0], 
+                                           context=context)
+            if employee.department_id:
+                department_id = employee.department_id.id
+        return department_id
+
+    def _get_account_line(self, cr, uid, ids, context=None):
+        aa_line_obj = self.pool.get('account.analytic.line')
+        return aa_line_obj.search(cr, uid,
+                                  [('account_id', 'in', ids)],
+                                  context=context)
+
     _columns = {
-        'department_id': fields.many2one('hr.department', 'Department'),
-    }
+        'department_id': fields.many2one(
+            'hr.department', 
+            'Department',
+            help="User's related department"),
+        'account_department_id': fields.related(
+            'account_id',
+            'department_id',
+            type='many2one',
+            relation='hr.department',
+            string='Account Department',
+            store={
+                'account.analytic.account': (_get_account_line,
+                                             ['department_id'],
+                                             50),
+                'account.analytic.line': (lambda self, cr, uid, ids, c=None: ids,
+                                          ['account_id'],
+                                          10),
+            },
+            readonly=True,
+            help="Account's related department"),
+    }
+
+    _defaults = {
+        'department_id': _get_department,
+    }
+
+       
\ 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-05-12 08:05:04 +0000
@@ -26,6 +26,17 @@
                 </field>
             </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>
@@ -34,6 +45,7 @@
             <field name="arch" type="xml">
                 <field name="company_id" position="after">
                     <field name="department_id"/>
+                    <field name="account_department_id"/>
                 </field>
             </field>
         </record>
@@ -45,6 +57,7 @@
             <field name="arch" type="xml">
                 <field name="company_id" position="after">
                     <field name="department_id"/>
+                    <field name="account_department_id"/>
                 </field>
             </field>
         </record>
@@ -56,9 +69,11 @@
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
                     <field name="department_id" widget="selection"/>
+                    <field name="account_department_id" widget="selection"/>
                 </field>
                 <xpath expr="/search/group/filter[@string='User']" position="after">
                     <filter string="Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Account Department" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_department_id'}"/>
                 </xpath>
             </field>
         </record>