diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index d85d082423f..e2c24fe96d2 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -30,8 +30,6 @@ import xml import rml_parse import pooler -from mx.DateTime import * - class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' @@ -41,7 +39,8 @@ class general_ledger(rml_parse.rml_parse): ## new_ids = [] if (data['model'] == 'account.account'): - new_ids = ids + new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or [] + #new_ids = ids else: new_ids.append(data['form']['Account_list']) @@ -51,7 +50,6 @@ class general_ledger(rml_parse.rml_parse): def __init__(self, cr, uid, name, context): super(general_ledger, self).__init__(cr, uid, name, context=context) - cr.sql_log=1 self.date_borne = {} self.query = "" self.child_ids = "" diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml index 75cb086b343..c711934639d 100644 --- a/addons/account/report/general_ledger.rml +++ b/addons/account/report/general_ledger.rml @@ -105,7 +105,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] @@ -156,7 +156,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml index 9e937a72baf..ced60e69c8b 100644 --- a/addons/account/report/general_ledger_landscape.rml +++ b/addons/account/report/general_ledger_landscape.rml @@ -104,7 +104,7 @@ [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]] @@ -165,7 +165,7 @@ [[ repeatIn(get_children_accounts(a,data['form']), 'o') ]] - [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] + [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]