diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py index 729f13ad1e4..7c224a24dca 100644 --- a/addons/account/report/general_ledger_landscape.py +++ b/addons/account/report/general_ledger_landscape.py @@ -37,7 +37,7 @@ class general_ledger_landscape(rml_parse.rml_parse): _name = 'report.account.general.ledger_landscape' - def preprocess(self, objects, data, ids): + def set_context(self, objects, data, ids, report_type = None): ## self.borne_date = self.get_min_date(data['form']) ## @@ -49,7 +49,7 @@ class general_ledger_landscape(rml_parse.rml_parse): objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids) - super(general_ledger_landscape, self).preprocess(objects, data, new_ids) + super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type) def __init__(self, cr, uid, name, context): super(general_ledger_landscape, self).__init__(cr, uid, name, context) @@ -180,7 +180,6 @@ class general_ledger_landscape(rml_parse.rml_parse): def get_children_accounts(self, account, form): - self.child_ids = self.pool.get('account.account').search(self.cr, self.uid, [('parent_id', 'child_of', self.ids)]) # diff --git a/addons/account/report/wizard_central_journal.rml b/addons/account/report/wizard_central_journal.rml index 7cefd80fbe2..13282ce67b3 100644 --- a/addons/account/report/wizard_central_journal.rml +++ b/addons/account/report/wizard_central_journal.rml @@ -146,7 +146,7 @@ [[ repeatIn(objects, 'o') ]] - [[ repeatIn(lines(data['form']['period_id'][0][2],data['form']['journal_id'][0][2]), 'line') ]] + [[ repeatIn(lines(data['form']['period_id'][0][2],data['form']['journal_id'][0][2]), 'line') ]] diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml index 4ab38a3041a..760c670246c 100644 --- a/addons/mrp/report/order.rml +++ b/addons/mrp/report/order.rml @@ -98,26 +98,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -168,7 +148,6 @@ - [[ repeatIn(objects,'o') ]] @@ -219,6 +198,9 @@ + + + @@ -236,7 +218,7 @@
- + [[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]] @@ -275,8 +257,6 @@ No. Of Hours - - [[ repeatIn(o.workcenter_lines,'line2') ]] @@ -340,3 +320,4 @@
+