diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml index ab73f3ce5d1..f3640e421d6 100644 --- a/addons/account/project/report/cost_ledger.rml +++ b/addons/account/project/report/cost_ledger.rml @@ -72,18 +72,20 @@ - - + + + + @@ -125,6 +127,7 @@ + @@ -162,7 +165,7 @@ - + Period from @@ -175,7 +178,7 @@ - + [[ data['form']['date1'] ]] @@ -192,7 +195,7 @@
- + Code / Date @@ -212,10 +215,10 @@ - + - Total : + Total : @@ -236,10 +239,10 @@ [[ repeatIn(objects,'o') ]] - + - [[ o.code ]] + [[ o.code ]] [[ o.complete_name ]] @@ -258,10 +261,10 @@ [[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]] - + - [[ move_g['code'] ]] + [[ move_g['code'] ]] [[ move_g['name'] ]] @@ -279,7 +282,7 @@ [[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]] - + [[ move_a['date'] ]] @@ -315,4 +318,4 @@ - + \ No newline at end of file diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py index 08dab933af3..ea0a9864d39 100644 --- a/addons/account/report/partner_balance.py +++ b/addons/account/report/partner_balance.py @@ -555,9 +555,9 @@ class partner_balance(report_sxw.rml_parse): 'AND l.reconcile_id IS NULL ' \ 'GROUP BY partner_id', (self.date_lst[0],)) - + print"self.cr.fetchone()[0]",self.cr.fetchone() if self.cr.fetchone() != None: - result_tmp = float(self.cr.fetchone()[0]) + result_tmp = float(self.cr.fetchone()[0]) or 0.0 else: result_tmp = 0.0 # diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py index 09c9f765b5a..1fb8012a886 100644 --- a/addons/account/wizard/wizard_partner_balance_report.py +++ b/addons/account/wizard/wizard_partner_balance_report.py @@ -40,17 +40,16 @@ period_form = ''' - - + + - - + - + ''' @@ -60,7 +59,7 @@ period_fields = { 'string':"Date/Period Filter", 'type':'selection', 'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')], - 'default': lambda *a:'byperiod' + 'default': lambda *a:'all' }, 'fiscalyear': { 'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear', @@ -117,7 +116,6 @@ class wizard_report(wizard.interface): else: raise wizard.except_wizard('UserError','Date not in a defined fiscal year') - states = { 'init': { 'actions': [_get_defaults],