Merge lp:~cv.clearcorp/openobject-addons/lp-985853-employee-work-address-has-wrong-domain into lp:openobject-addons/6.1

Proposed by Carlos Vásquez (ClearCorp)
Status: Needs review
Proposed branch: lp:~cv.clearcorp/openobject-addons/lp-985853-employee-work-address-has-wrong-domain
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
hr/hr_view.xml (+1/-1)
To merge this branch: bzr merge lp:~cv.clearcorp/openobject-addons/lp-985853-employee-work-address-has-wrong-domain
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email:

Description of the change

Bug fix, see the associated bug.

To post a comment you must log in.
Revision history for this message
Alexis de Lattre (alexis-via) wrote :

I have tested the proposed merge and I fully disagree with it. The partner of the employee is NOT the same partner as the partner of the company. In fact, each employee should have it's own dedicated partner (because he has its own accounting account and it's own bank account !).

Unmerged revisions

6746. By Carlos Vásquez (ClearCorp)

[FIX] bug 985853: wront domain on hr.employee.form view for the work address.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr/hr_view.xml'
2--- hr/hr_view.xml 2012-02-23 14:54:21 +0000
3+++ hr/hr_view.xml 2012-04-19 20:18:19 +0000
4@@ -57,7 +57,7 @@
5 <separator string="Contact Information" colspan="2"/>
6 <field name="address_home_id" colspan="2"/>
7 <field name="partner_id" invisible="1" />
8- <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" domain="[('partner_id', '=', partner_id)]"/>
9+ <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" domain="[('partner_id.ref_companies', 'in', (company_id))]"/>
10 <field name="work_phone"/>
11 <field name="mobile_phone"/>
12 <field name="work_email" widget="email" />