[FIX] account_analytic_plans: crossovered report always contained zeroes

lp bug: https://launchpad.net/bugs/685858 fixed bzr revid: odo@openerp.com-20101210193131-853ksed3t330f2px
2010-12-10 20:31:31 +01:00
parent acee5c69bc
commit c87800a68c
2 changed files with 7 additions and 5 deletions
@@ -97,19 +97,21 @@ class crossovered_analytic(report_sxw.rml_parse):

        self.final_list = children_list
        selected_ids = line_pool.search(self.cr, self.uid, [('account_id', 'in' ,self.final_list)])
+        
+        res['ref_qty'] = 0.0
+        res['ref_amt'] = 0.0
+        self.base_amount = 0.0
+        
        if selected_ids:
            query = "SELECT SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
                    WHERE aal.account_id = aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"

            self.cr.execute(query)
            info=self.cr.dictfetchall()
-
            res['ref_qty'] = info[0]['qty']
            res['ref_amt'] = info[0]['amt']
            self.base_amount = info[0]['amt']
-        res['ref_qty'] = 0.0
-        res['ref_amt'] = 0.0
-        self.base_amount = 0.0
+        
        result.append(res)
        return result

@@ -31,7 +31,7 @@ class account_crossovered_analytic(osv.osv_memory):
        'date1': fields.date('Start Date', required=True),
        'date2': fields.date('End Date', required=True),
        'journal_ids': fields.many2many('account.analytic.journal', 'crossovered_journal_rel', 'crossover_id', 'journal_id', 'Analytic Journal'),
-        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=False),
+        'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=True),
        'empty_line': fields.boolean('Dont show empty lines'),
    }
    _defaults = {