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

[Merge]with: lp:~openerp-dev/openobject-addons/trunk-contract-apa

Browse Source 
bzr revid: dbr@tinyerp.com-20120530110238-n2s59druawu6s3vj
This commit is contained in:
DBR (OpenERP)
2012-05-30 16:32:38 +05:30
parent 41161a904c fc9e75519f
commit 9974416947
6 changed files with 70 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+31 -22
View File
@@ -11,6 +11,15 @@
<menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
<menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
<act_window
context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
id="act_project_project_2_project_task_all"
name="Tasks"
res_model="project.task"
src_model="project.project"
view_mode="kanban,tree,form,calendar,graph"
view_type="form"/>
<!-- Project -->
<record id="edit_project" model="ir.ui.view">
@@ -33,21 +42,29 @@
<div class="oe_clear"/>
</div>
<sheet string="Project" layout="auto">
<group colspan="6" col="6">
<field name="name" string="Project Name" select="1"/>
<field name="analytic_account_id" invisible="1" required="0"/>
<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
<field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
<field name="progress_rate" widget="progressbar"/>
<group col="4" colspan="4">
<group col="2" colspan="2" class="oe_form_group_label_border">
<field name="name" string="Project Name" select="1"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
<field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
<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="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
<!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
<!--<field name="progress_rate" widget="progressbar"/>-->
</group>
<group col="2" colspan="2" class="oe_form_group_label_border">
<table border="0">
<tr name="use_tasks_row">
<th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
<td><field name="use_tasks" nolabel="1"/></td>
<td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
</tr>
</table>
</group>
</group>
<notebook colspan="4">
<page string="Administration">
<group col="2" colspan="2" name="kanban">
<separator colspan="2" string="Project Management"/>
<field name="use_tasks"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Performance"/>
<field name="planned_hours" widget="float_time"/>
@@ -65,6 +82,7 @@
</page>
<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"/>
@@ -72,7 +90,7 @@
</field>
</page>
<page string="Billing" groups="account.group_account_invoice">
<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
<!--<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>-->
<field name="warn_customer"/>
<field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
<newline/>
@@ -162,15 +180,6 @@
</field>
</record>
<act_window
context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
id="act_project_project_2_project_task_all"
name="Tasks"
res_model="project.task"
src_model="project.project"
view_mode="kanban,tree,form,calendar,graph"
view_type="form"/>
<record model="ir.ui.view" id="view_project_kanban">
<field name="name">project.project.kanban</field>
<field name="model">project.project</field>
addons/project/static/src/css/project.css
+3
View File
@@ -1,3 +1,6 @@
.oe_btn_width {
width: 100px;
}
.oe_kanban_project {
width: 300px;
}
addons/project_issue/project_issue.py
+1 -1
View File
@@ -533,7 +533,7 @@ class account_analytic_account(osv.osv):
_description = 'Analytic Account'
_columns = {
'use_issues' : fields.boolean('Issue Tracking:', help="Check this field if this project manages issues"),
'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
}
# _defaults = {
# 'use_issues': True,
addons/project_issue/project_issue_view.xml
+7 -3
View File
@@ -360,9 +360,13 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
<field name="use_tasks" position="after">
<field name="use_issues"/>
</field>
<xpath expr='//tr[@name="use_tasks_row"]' position='after'>
<tr name="use_issues_row">
<th style="border-right:1px solid #DDD;" width="140px">Issues Tracking</th>
<td><field name="use_issues" nolabel="1"/></td>
<td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
</tr>
</xpath>
<field name="priority" position="before">
<field name="project_escalation_id"/>
<field name="reply_to"/>
addons/project_long_term/project_long_term_view.xml
+18 -16
View File
@@ -97,27 +97,29 @@
# ------------------------------------------------------
# Project Phase
# ------------------------------------------------------
<record id="project_phase_form" model="ir.ui.view">
<field name="name">Inherit project form : Phase</field>
<field name="model">project.project</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
<field name="use_tasks" position="after">
<field name="use_phases"/>
</field>
</field>
</record>
<act_window id="act_project_phases"
name="Phases"
src_model="project.project"
res_model="project.phase"
view_type="form"
view_mode="tree,form"
context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
/>
context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
<record id="project_phase_form" model="ir.ui.view">
<field name="name">Inherit project form : Phase</field>
<field name="model">project.project</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
<xpath expr='//tr[@name="use_tasks_row"]' position='after'>
<tr name="use_phases_row">
<th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th>
<td><field name="use_phases" nolabel="1"/></td>
<td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
</tr>
</xpath>
</field>
</record>
<record id="view_project_kanban_phase" model="ir.ui.view">
<field name="name">project.project.kanban.inherited</field>
@@ -330,7 +332,7 @@
<field name="type">search</field>
<field name="inherit_id" ref="project.view_task_search_form"/>
<field name="arch" type="xml">
<field name="project_id" position="after">
<field name="name" position="after">
<field name="phase_id" select="1"/>
</field>
</field>
addons/project_timesheet/project_timesheet_view.xml
+10 -6
View File
@@ -7,11 +7,13 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
<field name="use_tasks" position='after'>
<field name="use_timesheets"/>
<field name="amount_to_invoice" invisible="True"/>
<field name="time_to_invoice" invisible="True"/>
</field>
<xpath expr='//tr[@name="use_tasks_row"]' position='after'>
<tr name="use_timesheets_row">
<th style="border-right:1px solid #DDD;" width="140px">Timesheets</th>
<td><field name="use_timesheets" nolabel="1"/></td>
<td style="text-align:right;"><button class="oe_btn_width" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
</tr>
</xpath>
<field name="warn_customer" position="after">
<group colspan="4" col="4">
<separator colspan="4" string="Invoicing Data"/>
@@ -19,6 +21,8 @@
<field name="to_invoice" widget="selection" string="Invoice Task Work"/>
<field name="amount_max"/>
<field name="amount_invoiced"/>
<field name="amount_to_invoice" invisible="True"/>
<field name="time_to_invoice" invisible="True"/>
</group>
</field>
</field>
@@ -58,7 +62,7 @@
<field name="inherit_id" ref="project_invoice_form"/>
<field name="arch" type="xml">
<field name="partner_id" position="replace">
<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer" attrs="{'required':[('to_invoice','!=',False)]}"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer" attrs="{'required':[('to_invoice','!=',False)]}"/>
</field>
</field>
</record>