diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py index b9e01e48bbf..1da49aca568 100644 --- a/addons/account/report/account_aged_partner_balance.py +++ b/addons/account/report/account_aged_partner_balance.py @@ -30,7 +30,6 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header): def __init__(self, cr, uid, name, context): super(aged_trial_report, self).__init__(cr, uid, name, context=context) - self.query_line = '' self.total_account = [] self.localcontext.update({ 'time': time, @@ -47,7 +46,8 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header): }) def set_context(self, objects, data, ids, report_type=None): - self.query = data['form'].get('query_line', '') + obj_move = self.pool.get('account.move.line') + self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context',{})) self.direction_selection = data['form'].get('direction_selection', 'past') self.target_move = data['form'].get('target_move', 'all') self.date_from = data['form'].get('date_from', time.strftime('%Y-%m-%d')) diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py index dcf35665a02..d1c31db8cfb 100644 --- a/addons/account/report/account_partner_balance.py +++ b/addons/account/report/account_partner_balance.py @@ -52,8 +52,10 @@ class partner_balance(report_sxw.rml_parse, common_report_header): def set_context(self, objects, data, ids, report_type=None): self.display_partner = data['form'].get('display_partner', 'non-zero_balance') - self.query = data['form'].get('query_line', '') - self.init_query = data['form'].get('initial_bal_query', '') + obj_move = self.pool.get('account.move.line') + self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context',{})) +# self.init_query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context_initial_bal', {})) + self.result_selection = data['form'].get('result_selection') self.target_move = data['form'].get('target_move', 'all') @@ -116,7 +118,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header): for rec in full_account: if not rec.get('name', False): rec.update({'name': _('Unknown Partner')}) - + ## We will now compute Total subtotal_row = self._add_subtotal(full_account) return subtotal_row @@ -141,8 +143,8 @@ class partner_balance(report_sxw.rml_parse, common_report_header): new_header['ref'] = '' new_header['name'] = r['account_name'] new_header['code'] = r['code'] - new_header['debit'] = r['debit'] - new_header['credit'] = r['credit'] + new_header['debit'] = r['debit'] + new_header['credit'] = r['credit'] new_header['scredit'] = tot_scredit new_header['sdebit'] = tot_sdebit new_header['enlitige'] = tot_enlitige diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py index 2a0c7446b6b..12309cb3d27 100644 --- a/addons/account/report/account_partner_ledger.py +++ b/addons/account/report/account_partner_ledger.py @@ -56,8 +56,9 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header): }) def set_context(self, objects, data, ids, report_type=None): - self.query = data['form'].get('query_line', '') - self.init_query = data['form'].get('initial_bal_query', '') + obj_move = self.pool.get('account.move.line') + self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context',{})) + self.init_query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context_initial_bal', {})) self.reconcil = data['form'].get('reconcil', True) self.initial_balance = data['form'].get('initial_balance', True) self.result_selection = data['form'].get('result_selection', 'customer')