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/account_analytic_plans | |
| parent | b982ea278b33132def3927417b7a854b98b5028a (diff) | |
| parent | 3925f76ce85854e5d4834902a05f57bcfc5ace85 (diff) | |
[MERGE]merged with trunk-survey-layout-tta
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
Diffstat (limited to 'addons/account_analytic_plans')
5 files changed, 18 insertions, 20 deletions
diff --git a/addons/account_analytic_plans/account_analytic_plans_report.xml b/addons/account_analytic_plans/account_analytic_plans_report.xml index 663e0eeab13..05d4c5b445c 100644 --- a/addons/account_analytic_plans/account_analytic_plans_report.xml +++ b/addons/account_analytic_plans/account_analytic_plans_report.xml @@ -1,16 +1,16 @@ <?xml version="1.0"?> <openerp> - <data> + <data> - <report - id="account_analytic_account_crossovered_analytic" - string="Crossovered Analytic" - model="account.analytic.account" - name="account.analytic.account.crossovered.analytic" - rml="account_analytic_plans/report/crossovered_analytic.rml" - auto="False" - menu="False"/> + <report + id="account_analytic_account_crossovered_analytic" + string="Crossovered Analytic" + model="account.analytic.account" + name="account.analytic.account.crossovered.analytic" + rml="account_analytic_plans/report/crossovered_analytic.rml" + auto="False" + menu="False"/> - </data> + </data> </openerp> diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py index e2ad9e05b04..3e8eec81c55 100644 --- a/addons/account_analytic_plans/report/crossovered_analytic.py +++ b/addons/account_analytic_plans/report/crossovered_analytic.py @@ -109,7 +109,6 @@ class crossovered_analytic(report_sxw.rml_parse): res['ref_qty'] = info[0]['qty'] res['ref_amt'] = info[0]['amt'] self.base_amount = info[0]['amt'] - result.append(res) return result diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml index 766fb9f0d0d..48e7c13b0a1 100644 --- a/addons/account_analytic_plans/report/crossovered_analytic.rml +++ b/addons/account_analytic_plans/report/crossovered_analytic.rml @@ -237,10 +237,10 @@ <para style="terp_default_Centre_9">[[ a['ref_code'] ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(a['ref_qty']) ]]</para> + <para style="terp_default_Right_9">[[ a['ref_qty'] and formatLang(a['ref_qty']) ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para> + <para style="terp_default_Right_9">[[ a['ref_amt'] and formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para> </td> <td> <para style="terp_default_Right_9">100.00%</para> diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml index 4138fe79582..ae95f0f7584 100644 --- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml +++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml @@ -9,8 +9,9 @@ <field name="arch" type="xml"> <form string="Crossovered Analytic" version="7.0"> <header> - <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> - <button special="cancel" string="Cancel" icon='gtk-cancel'/> + <button name="print_report" string="Print" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel"/> </header> <group col="4"> <field name="date1"/> diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml index fd7c03e058e..b67e61bafc6 100644 --- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml +++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml @@ -8,8 +8,9 @@ <field name="arch" type="xml"> <form string="Distribution Model Saved" version="7.0"> <header> - <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/> - <button special="cancel" string="Cancel" icon='gtk-ok' /> + <button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel"/> </header> <label string="Save This Distribution as a Model"/> </form> @@ -22,9 +23,6 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Distribution Model Saved" version="7.0"> - <header> - <button special="cancel" string="Ok" icon='gtk-ok'/> - </header> <label string="This distribution model has been saved.You will be able to reuse it later."/> </form> </field> |