diff options
| author | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
|---|---|---|
| committer | Vijaykumar Baladaniya <vba@tinyerp.com> | 2012-07-09 18:31:13 +0530 |
| commit | be2e95656aaa113addea2b510fcdcf2f890eaaa4 (patch) | |
| tree | abcb3dd4ef350a1b8ad0eaffdd2b9a1cb91521af /addons/project_gtd | |
| parent | b982ea278b33132def3927417b7a854b98b5028a (diff) | |
| parent | 3925f76ce85854e5d4834902a05f57bcfc5ace85 (diff) | |
[MERGE]merged with trunk-survey-layout-tta
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
Diffstat (limited to 'addons/project_gtd')
| -rw-r--r-- | addons/project_gtd/project_gtd.py | 2 | ||||
| -rw-r--r-- | addons/project_gtd/wizard/project_gtd_empty_view.xml | 3 | ||||
| -rw-r--r-- | addons/project_gtd/wizard/project_gtd_fill_view.xml | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py index bb61617c9f7..c4e485876d8 100644 --- a/addons/project_gtd/project_gtd.py +++ b/addons/project_gtd/project_gtd.py @@ -116,7 +116,7 @@ class project_task(osv.osv): search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'user_invisible': True}"/>\n''' search_extended +='''<separator orientation="vertical"/>''' - res['arch'] = res['arch'].replace('<separator name="gtdsep"/>', search_extended) + res['arch'] = tools.ustr(res['arch']).replace('<separator name="gtdsep"/>', search_extended) return res diff --git a/addons/project_gtd/wizard/project_gtd_empty_view.xml b/addons/project_gtd/wizard/project_gtd_empty_view.xml index 9beb118cdcc..e166d997226 100644 --- a/addons/project_gtd/wizard/project_gtd_empty_view.xml +++ b/addons/project_gtd/wizard/project_gtd_empty_view.xml @@ -8,9 +8,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Empty Timebox" version="7.0"> - <header> - <button icon="gtk-ok" special="cancel" string="_Ok" colspan="1"/><label colspan="1"/> - </header> <label string="Timebox Empty Process Completed Successfully." /> </form> </field> diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml index 6a38ccdb6a6..aa81b9d6c43 100644 --- a/addons/project_gtd/wizard/project_gtd_fill_view.xml +++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml @@ -9,8 +9,9 @@ <field name="arch" type="xml"> <form string="Plannify Timebox" version="7.0"> <header> - <button icon="gtk-cancel" special="cancel" string="_Cancel"/> - <button name="process" icon="gtk-ok" string="Add to Timebox" type="object" /> + <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> </header> <group col="4"> <field name="timebox_id" widget="selection"/> |