pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
bzr revid: apa@tinyerp.com-20120530130309-h28bp6s3ldgtzslo
This commit is contained in:
Amit Patel (OpenERP)
2012-05-30 18:33:09 +05:30
parent eddbed0f58 3b7f1698d9
commit ebf0d6cab4
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/analytic/analytic_view.xml
+1 -1
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"/>
addons/project/project.py
+4 -2
View File
@@ -170,8 +170,8 @@ class project(osv.osv):
'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
#'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
# help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'tasks': fields.one2many('project.task', 'project_id', "Task Activities"),
'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
store = {
@@ -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,
addons/project/project_view.xml
+7 -2
View File
@@ -80,8 +80,9 @@
<field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
</group>
</page>
<page string="Team">
<field colspan="4" name="members" nolabel="1">
<page string="Members">
<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"/>
@@ -585,6 +586,7 @@
<filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="project_id" invisible="1"/>
<filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
<field name="user_id">
<filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
@@ -619,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>