Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-remove_contract_link_from_project_view-rma into lp:openobject-addons

  1. trunk-remove_contract_link_from_project_view-rma
  2. Merge into trunk
Proposed by Randhir Mayatra (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-remove_contract_link_from_project_view-rma
Merge into: lp:openobject-addons
Diff against target: 36 lines (+9/-5)
2 files modified
project/project.py (+3/-1)
project/project_view.xml (+6/-4)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-remove_contract_link_from_project_view-rma
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+214674@code.launchpad.net

Description of the change

Hello,
Remove string "To invoice or setup invoicing..." and "analytic_account_id" link from project form view.

Thanks.
-RMA

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-remove_contract_link_from_project_view-rma updated
9290. By Randhir Mayatra (OpenERP)

[IMP] set normal default type for contract

9291. By Randhir Mayatra (OpenERP)

[MERGE] merge with latest trunk

9292. By Randhir Mayatra (OpenERP)

[MERGE] merge with latest trunk

9293. By Randhir Mayatra (OpenERP)

[MERGE] merge with latest trunk

9294. By Randhir Mayatra (OpenERP)

[IMP] change default type and show analyatic link

9295. By Randhir Mayatra (OpenERP)

[IMP] improve link visiblity on project form

9296. By Randhir Mayatra (OpenERP)

[IMP] improve visisblity for link

9297. By Randhir Mayatra (OpenERP)

[IMP] remove changes for write method

Unmerged revisions

9297. By Randhir Mayatra (OpenERP)

[IMP] remove changes for write method

9296. By Randhir Mayatra (OpenERP)

[IMP] improve visisblity for link

9295. By Randhir Mayatra (OpenERP)

[IMP] improve link visiblity on project form

9294. By Randhir Mayatra (OpenERP)

[IMP] change default type and show analyatic link

9293. By Randhir Mayatra (OpenERP)

[MERGE] merge with latest trunk

9292. By Randhir Mayatra (OpenERP)

[MERGE] merge with latest trunk

9291. By Randhir Mayatra (OpenERP)

[MERGE] merge with latest trunk

9290. By Randhir Mayatra (OpenERP)

[IMP] set normal default type for contract

9289. By Randhir Mayatra (OpenERP)

[IMP] remove contract link from project view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project/project.py'
2--- project/project.py 2014-04-07 16:33:18 +0000
3+++ project/project.py 2014-04-25 05:25:47 +0000
4@@ -541,8 +541,10 @@
5 alias_model_name=vals.get('alias_model', 'project.task'),
6 alias_parent_model_name=self._name)
7
8- if vals.get('type', False) not in ('template', 'contract'):
9+ if vals.get('type', False) not in ('template', 'contract') and vals.get('partner_id',False):
10 vals['type'] = 'contract'
11+ else:
12+ vals['type'] = 'normal'
13
14 project_id = super(project, self).create(cr, uid, vals, context=create_context)
15 project_rec = self.browse(cr, uid, project_id, context=context)
16
17=== modified file 'project/project_view.xml'
18--- project/project_view.xml 2014-04-03 15:59:04 +0000
19+++ project/project_view.xml 2014-04-25 05:25:47 +0000
20@@ -103,10 +103,12 @@
21 context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'project.group_project_manager']}"/>
22 <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
23 <span></span>
24- <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
25- To invoice or setup invoicing and renewal options, go to the related contract:
26- <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
27- </p>
28+ <div attrs="{'invisible': ['|',('partner_id', '=', False),('analytic_account_id', '=', False)]}">
29+ <p>
30+ To invoice or setup invoicing and renewal options, go to the related contract:
31+ <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
32+ </p>
33+ </div>
34 </group>
35 <group name="group_alias"
36 attrs="{'invisible': [('alias_domain', '=', False)]}">

Subscribers

People subscribed via source and target branches

to all changes: