odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE/IMP]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-follower-dbr 

bzr revid: apa@tinyerp.com-20120604093905-flfm36syrqva9zfc
This commit is contained in:
Amit Patel (OpenERP) 2012-06-04 15:09:05 +05:30
parent a5604d2cfa 60bffb4717
commit 6c6326cdab
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -77,7 +77,7 @@
<td class="oe_th_150px"><button class= "oe_btn_width" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
</tr>
<tr>
<th class="oe_border_right">Inv. On Timesheets</th>
<th class="oe_border_right">Invoice On Timesheets</th>
<td><field name="invoice_on_timesheets" nolabel="1"/></td>
<td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
<td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
@ -109,8 +109,8 @@
</table>
</group>
<group colspan="4" class="oe_form_group_label_border">
<field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
<field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
</group>
</xpath>
</field>
@ -124,7 +124,7 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<xpath expr='//page[@name="team"]' position='after'>
<page string="Contract data">
<page string="Contract Data">
<group colspan="2" col= "2" class="oe_form_group_label_border">
<separator colspan="2" string="Validity"/>
<field name="date_start"/>

2
addons/project/project_view.xml
View File

@ -86,7 +86,7 @@
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
</group>
</page>
<page name="team" string="Team">
<page name="team" string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}">
<field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
<tree string="Members">
<field name="name"/>

7
addons/project/security/project_security.xml
View File

@ -36,6 +36,13 @@
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="project_public_members_rule">
<field name="name">public Members</field>
<field name="model_id" ref="model_project_project"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('privacy_visility','in',[False,'public']),('members','in',[user.id])]</field>
</record>
<record model="ir.rule" id="task_comp_rule">
<field name="name" >Task multi-company</field>
<field name="model_id" ref="model_project_task"/>

10
addons/project_issue/project_issue_view.xml
View File

@ -362,6 +362,16 @@
<field name="project_escalation_id"/>
<field name="reply_to"/>
</field>
<xpath expr='//page[@name="team"]' position='replace'>
<page name="team" string="Team" attrs="{'invisible':[('use_tasks','=', 0),('use_issues','=', 0)]}">
<field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
<tree string="Members">
<field name="name"/>
<field name="user_email"/>
</tree>
</field>
</page>
</xpath>
</field>
</record>