[MERGE] lp:~openerp-commiter/openobject-addons/trunk-mail-alias-jam-fix-aja

bzr revid: jam@tinyerp.com-20120629071553-77q0whbwnehb0932
This commit is contained in:
Jigar Amin - OpenERP
2012-06-29 12:45:53 +05:30
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -76,7 +76,7 @@
<field name="user_id"/>
<field name="resource_calendar_id"/>
<field name="active"/>
<field name="alias_id" required="0" />
<field name="alias_id" required="0" domain="[('alias_model_id', '=','crm.lead')]"/>
</group>
</group>
<notebook colspan="4">
@@ -349,7 +349,7 @@
</div>
</field>
<field name="company_id" version="7.0" position="after">
<field name="alias_id" required="0"/>
<field name="alias_id" required="0" domain="[('alias_model_id','=','hr.applicant')]"/>
</field>
</field>
</record>
+1 -1
View File
@@ -70,7 +70,7 @@
</div>
<field name="description" colspan="4" nolabel="1"/>
<div class="oe_edit_only">
<field name="alias_id" required="0"/>
<field name="alias_id" required="0" domain="[('alias_model_id','=','mail.group')]" />
</div>
</div>
</div>
+1 -1
View File
@@ -55,7 +55,7 @@
<field name="analytic_account_id" invisible="1" required="0"/>
<field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
<field name="privacy_visibility"/>
<field name="alias_id" required="0"/>
<field name="alias_id" required="0" domain="[('alias_model_id','in',('project.task','project.issue'))]"/>
<field name="alias_model"/>
</group>
<group>