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

[IMP]project: Set members field in proper module 

bzr revid: dbr@tinyerp.com-20120530123913-e7u4m3m3u6lgiop6
This commit is contained in:
DBR (OpenERP) 2012-05-30 18:09:13 +05:30
parent 9974416947
commit 3b7f1698d9
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -56,7 +56,7 @@
<field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
</group>
</xpath>
<xpath expr='//separator[@name="team"]' position='before'>
<xpath expr='//separator[@name="description"]' position='before'>
<separator colspan="4" string="Invoicing" name="invoicing"/>
<group colspan="4">
<group col="2" colspan="1" class="oe_form_group_label_border">

2
addons/analytic/analytic.py
View File

@ -170,8 +170,6 @@ class account_analytic_account(osv.osv):
'user_id': fields.many2one('res.users', 'Account Manager'),
'date_start': fields.date('Date Start'),
'date': fields.date('Date End', select=True),
'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,
help='* When an account is created its in \'Draft\' state.\

4
addons/analytic/analytic_view.xml
View File

@ -20,7 +20,7 @@
</group>
<notebook colspan="4">
<page string="Contract Information" name="contract_page">
<group colspan="2" col="2" name="contract" class="oe_form_group_label_border">
<group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
<separator colspan="2" string="Validity"/>
<field name="date_start"/>
<field name="date"/>
@ -28,8 +28,6 @@
<group colspan="2" col="2" name="project" class="oe_form_group_label_border">
<separator colspan="2" string="Project" name="project_sep" invisible="1"/>
</group>
<separator string="Team" colspan="4" name="team"/>
<field colspan="4" name="members" nolabel="1"/>
<separator string="Terms and Condition" colspan="4" name="description"/>
<field colspan="4" name="description" nolabel="1"/>
</page>

2
addons/project/project.py
View File

@ -1236,6 +1236,8 @@ class account_analytic_account(osv.osv):
_columns = {
'use_tasks': fields.boolean('Tasks Management'),
'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
}
# _defaults = {
# 'use_tasks': True,

3
addons/project/project_view.xml
View File

@ -621,6 +621,9 @@
<xpath expr='//separator[@name="project_sep"]' position='replace'>
<separator colspan="2" string="Project" name="project_sep"/>
</xpath>
<xpath expr='//separator[@name="description"]' position='before'>
<field name="members" colspan="4" nolabel="1"/>
</xpath>
<xpath expr='//group[@name="project"]' position='inside'>
<field name="use_tasks" />
</xpath>