Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-project-view-improvement-bde into
lp:~openerp-dev/openobject-addons/trunk-project-view-imp-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-view-improvement-bde/+merge/111794
Hello Sir,
I have improved the views of project module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-project-view-improvement-bde/+merge/111794
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-project-view-improvement-bde into
lp:~openerp-dev/openobject-addons/trunk-project-view-imp-atp.
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-06-22 10:29:59 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-06-25 08:41:27 +0000
@@ -446,8 +446,8 @@
<field name="type">form</field>
<field name="inherit_id" ref="resource.resource_calendar_leave_form"/>
<field name="arch" type="xml">
- <field name="date_to" position="after">
- <field name="holiday_id"/>
+ <field name="name" position="after">
+ <field name="holiday_id" string="Leave Request"/>
</field>
</field>
</record>
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-06-22 13:05:06 +0000
+++ project/project_view.xml 2012-06-25 08:41:27 +0000
@@ -359,10 +359,10 @@
<group>
<group>
<field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+ <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group>
- <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
<field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
groups="project.group_time_work_estimation_tasks"
on_change="onchange_planned(planned_hours, effective_hours)"/>
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2012-06-22 13:05:06 +0000
+++ project_issue/project_issue_view.xml 2012-06-25 08:41:27 +0000
@@ -91,7 +91,6 @@
<field name="version_id" widget="selection"/>
<field name="priority"/>
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
- <field name="state" groups="base.group_no_one"/>
</group>
</group>
<field name="description" placeholder="Add a description..." />
@@ -112,6 +111,10 @@
<field name="id"/>
<field name="active"/>
</group>
+ <group colspan="4" col="4">
+ <separator string="State" colspan="4"/>
+ <field name="state" groups="base.group_no_one"/>
+ </group>
</page>
</notebook>
</sheet>
=== modified file 'project_issue_sheet/project_issue_sheet_view.xml'
--- project_issue_sheet/project_issue_sheet_view.xml 2012-05-22 10:37:54 +0000
+++ project_issue_sheet/project_issue_sheet_view.xml 2012-06-25 08:41:27 +0000
@@ -10,11 +10,15 @@
<field name="project_id" position="attributes">
<attribute name="on_change">on_change_project(project_id)</attribute>
</field>
- <xpath expr="//notebook" position="before">
- <field name="analytic_account_id"
- domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
- on_change='on_change_account_id(analytic_account_id)'/>
- </xpath>
+ <field name="active" position="after">
+ <separator string="Analytic Account" colspan="4"/>
+ <newline/>
+ <group colspan="4" col="4">
+ <field name="analytic_account_id"
+ domain="[('parent_id','!=',False),('partner_id', '=', partner_id),('type', '!=', 'view')]"
+ on_change='on_change_account_id(analytic_account_id)'/>
+ </group>
+ </field>
<xpath expr="//notebook/page[@string='Extra Info']" position="before">
<page string="Worklogs">
<field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml 2012-06-22 11:12:51 +0000
+++ project_long_term/project_long_term_view.xml 2012-06-25 08:41:27 +0000
@@ -212,7 +212,7 @@
<field name="sequence"/>
</group>
</group>
- <separator string="Force Assigned Users"/>
+ <h2><label string="Force Assigned Users"/></h2>
<field name="user_force_ids" widget="many2many_tags" />
<separator string="Previous Phases"/>
<field name="previous_phase_ids"/>
@@ -326,7 +326,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="project.view_task_form2"/>
<field name="arch" type="xml">
- <xpath expr="//field[@name='effective_hours']" position="after">
+ <xpath expr="//field[@name='user_id']" position="after">
<field name="phase_id" context="{'default_project_id' : project_id}"/>
</xpath>
</field>
=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml 2012-06-22 11:12:51 +0000
+++ resource/resource_view.xml 2012-06-25 08:41:27 +0000
@@ -120,11 +120,11 @@
<field name="model">resource.calendar.attendance</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Working Time">
+ <tree string="Working Time" editable="top">
<field name="name"/>
<field name="dayofweek"/>
- <field name="hour_from" widget="float_time" />
- <field name="hour_to" widget="float_time" />
+ <field name="hour_from" widget="float_time"/>
+ <field name="hour_to" widget="float_time"/>
</tree>
</field>
</record>
@@ -135,11 +135,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Working Time" version="7.0">
- <field colspan="4" name="name"/>
- <field name="date_from"/>
- <field name="dayofweek"/>
- <field name="hour_from" widget="float_time"/>
- <field name="hour_to" widget="float_time"/>
+ <group colspan="4">
+ <field name="name"/>
+ <field name="date_from"/>
+ <field name="dayofweek"/>
+ <label for="hour_from" string="Hours"/>
+ <div>
+ <field name="hour_from" widget="float_time"/>-
+ <field name="hour_to" widget="float_time"/>
+ </div>
+ </group>
</form>
</field>
</record>
@@ -232,12 +237,15 @@
<field name="name" string="Reason"/>
</group>
<group>
- <field name="date_from"/>
<field name="calendar_id" string="Working Period"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
- <group>
- <field name="date_to"/>
+ <group col="2" colspan="4">
+ <label for="date_from" string="Duration"/>
+ <div>
+ <field name="date_from" nolabel="1"/> -
+ <field name="date_to" nolabel="1"/>
+ </div>
</group>
</group>
</sheet>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
