Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-commiter/openobject-addons/trunk-mail-alias-jam-fix-aja into lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam

  1. trunk-mail-alias-jam-fix-aja
  2. Merge into trunk-mail-alias-jam
Proposed by ajay javiya (OpenERP)
Status: Merged
Merged at revision: 6931
Proposed branch: lp:~openerp-commiter/openobject-addons/trunk-mail-alias-jam-fix-aja
Merge into: lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam
Diff against target: 57 lines (+5/-5)
4 files modified
crm/crm_view.xml (+1/-1)
hr_recruitment/hr_recruitment_view.xml (+1/-1)
mail/mail_group_view.xml (+2/-2)
project/project_view.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-commiter/openobject-addons/trunk-mail-alias-jam-fix-aja
Reviewer Review Type Date Requested Status
Jigar A. Approve
Review via email: mp+112713@code.launchpad.net

Description of the change

Hello
Improve mail.alias in hr_recruitment,crm,mail and project module.
Thank You

To post a comment you must log in.
Revision history for this message
Jigar A. (ifixthat) wrote :

Kindly do avoid Unexpected changes like lin#40 and #41.
Thank You

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm/crm_view.xml'
2--- crm/crm_view.xml 2012-06-28 05:09:49 +0000
3+++ crm/crm_view.xml 2012-06-29 06:59:31 +0000
4@@ -76,7 +76,7 @@
5 <field name="user_id"/>
6 <field name="resource_calendar_id"/>
7 <field name="active"/>
8- <field name="alias_id" required="0" />
9+ <field name="alias_id" required="0" domain="[('alias_model_id', '=','crm.lead')]"/>
10 </group>
11 </group>
12 <notebook colspan="4">
13
14=== modified file 'hr_recruitment/hr_recruitment_view.xml'
15--- hr_recruitment/hr_recruitment_view.xml 2012-06-26 11:32:29 +0000
16+++ hr_recruitment/hr_recruitment_view.xml 2012-06-29 06:59:31 +0000
17@@ -349,7 +349,7 @@
18 </div>
19 </field>
20 <field name="company_id" version="7.0" position="after">
21- <field name="alias_id" required="0"/>
22+ <field name="alias_id" required="0" domain="[('alias_model_id','=','hr.applicant')]"/>
23 </field>
24 </field>
25 </record>
26
27=== modified file 'mail/mail_group_view.xml'
28--- mail/mail_group_view.xml 2012-06-26 11:32:29 +0000
29+++ mail/mail_group_view.xml 2012-06-29 06:59:31 +0000
30@@ -70,12 +70,12 @@
31 </div>
32 <field name="description" colspan="4" nolabel="1"/>
33 <div class="oe_edit_only">
34- <field name="alias_id" required="0"/>
35+ <field name="alias_id" required="0" domain="[('alias_model_id','=','mail.group')]" />
36 </div>
37 </div>
38 </div>
39 <footer>
40- <field name="message_ids" colspan="4" widget="ThreadView" options='{"thread_level": 1}'/>
41+ <field name="message_ids" colspan="4" widget="ThreadView" options='{"thread_level": 1}' />
42 </footer>
43 </form>
44 </field>
45
46=== modified file 'project/project_view.xml'
47--- project/project_view.xml 2012-06-29 04:31:14 +0000
48+++ project/project_view.xml 2012-06-29 06:59:31 +0000
49@@ -55,7 +55,7 @@
50 <field name="analytic_account_id" invisible="1" required="0"/>
51 <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
52 <field name="privacy_visibility"/>
53- <field name="alias_id" required="0"/>
54+ <field name="alias_id" required="0" domain="[('alias_model_id','in',('project.task','project.issue'))]"/>
55 <field name="alias_model"/>
56 </group>
57 <group>

Subscribers

People subscribed via source and target branches