diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-07-11 09:52:57 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-07-11 09:52:57 +0200 |
| commit | 1daefb8fd5fb344f6e9ea0bce03b3ffbfbc8253d (patch) | |
| tree | b3a07be7bd960593df315512b5f471eebd497d03 /addons/project | |
| parent | d43db51a02806d175079ce63b755502c05c50db1 (diff) | |
| parent | 6cbb04758af8d1e7056df3eadbf1b490b958b0b5 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120711075257-1gldrjfxw8vgi7hx
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/i18n/ja.po | 4 | ||||
| -rw-r--r-- | addons/project/wizard/project_task_delegate_view.xml | 10 | ||||
| -rw-r--r-- | addons/project/wizard/project_task_reevaluate_view.xml | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po index 68f60160a76..8e9ece1452f 100644 --- a/addons/project/i18n/ja.po +++ b/addons/project/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n" -"X-Generator: Launchpad (build 15558)\n" +"X-Launchpad-Export-Date: 2012-07-11 05:14+0000\n" +"X-Generator: Launchpad (build 15593)\n" #. module: project #: view:report.project.task.user:0 diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index 7dd1cdb9465..4bd7e4b5b1d 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -8,11 +8,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Project Task Delegate" version="7.0"> - <header> - <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> - </header> <group> <group> <field name="project_id" on_change="onchange_project_id(project_id)"/> @@ -30,6 +25,11 @@ <field name="state"/> </group> </group> + <footer> + <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml index 066f15582b4..84436c045a6 100644 --- a/addons/project/wizard/project_task_reevaluate_view.xml +++ b/addons/project/wizard/project_task_reevaluate_view.xml @@ -8,15 +8,15 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Reevaluate Task" version="7.0"> - <header> - <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> - </header> <separator string="Reevaluation Task"/> <group> <field name="remaining_hours" widget="float_time"/> </group> + <footer> + <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> |