Skip to content

Commit

Permalink
Merge pull request OCA#32 from fmdl/full_sql
Browse files Browse the repository at this point in the history
Full sql
  • Loading branch information
fmdl committed Nov 5, 2017
2 parents 47eaf5a + e14d2b2 commit 6ca1a80
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions report/report_account_standard_excel.py
Expand Up @@ -86,7 +86,7 @@ def _header_sheet(sheet):
'col': {'total_function': 'sum', 'format': currency_format}},
]

all_lines = wizard.sql_get_line_for_report(type_l=('4_total',))
all_lines = wizard._sql_get_line_for_report(type_l=('4_total',))
# print(all_lines)
if all_lines:

Expand Down Expand Up @@ -210,7 +210,7 @@ def _set_table(start_row, row):
_header_sheet(sheet)

row = 6
all_lines = wizard.sql_get_line_for_report(type_l=('1_init_line', '2_line'))
all_lines = wizard._sql_get_line_for_report(type_l=('1_init_line', '2_line'))
for obj in report.report_object_ids:

lines_obj = []
Expand Down Expand Up @@ -280,7 +280,7 @@ def _set_table(start_row, row):
sheet = workbook.add_worksheet(report.name)
_header_sheet(sheet)

all_lines = wizard.sql_get_line_for_report(type_l=('4_total',))
all_lines = wizard._sql_get_line_for_report(type_l=('4_total',))
# for group_by in data['group_by_data']['ids']:
# all_lines.append(data['lines_group_by'][group_by])
if all_lines:
Expand Down Expand Up @@ -405,7 +405,7 @@ def _set_table(start_row, row):

row = 6

all_lines = wizard.sql_get_line_for_report(type_l=('0_init', '1_init_line', '2_line'))
all_lines = wizard._sql_get_line_for_report(type_l=('0_init', '1_init_line', '2_line'))
for obj in report.report_object_ids:
lines_obj = []
obj_id = obj.id
Expand Down
20 changes: 10 additions & 10 deletions wizard/account_standard_report.py
Expand Up @@ -6,7 +6,7 @@
from datetime import datetime, timedelta
from odoo import api, models, fields, _
from odoo.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT

from odoo.exceptions import AccessError, UserError

D_LEDGER = {'general': {'name': _('General Ledger'),
'group_by': 'account_id',
Expand Down Expand Up @@ -234,8 +234,7 @@ def on_change_month_selec(self):

def action_view_lines(self):
self.ensure_one()
self.compute_data()

self._compute_data()
return {
'name': _("Ledger Lines"),
'view_type': 'form',
Expand All @@ -250,16 +249,15 @@ def action_view_lines(self):

def print_pdf_report(self):
self.ensure_one()
self.compute_data()

self._compute_data()
return self.env['report'].get_action(self, 'account_standard_report.report_account_standard_report')

def print_excel_report(self):
self.ensure_one()
self.compute_data()
self._compute_data()
return self.env['report'].get_action(self, 'account_standard_report.report_account_standard_excel')

def pre_compute(self):
def _pre_compute(self):
lang_code = self.env.context.get('lang') or 'en_US'
date_format = self.env['res.lang']._lang_get(lang_code).date_format
time_format = self.env['res.lang']._lang_get(lang_code).time_format
Expand Down Expand Up @@ -287,8 +285,10 @@ def pre_compute(self):
self.reconciled = True
self.partner_select_ids = False

def compute_data(self):
self.pre_compute()
def _compute_data(self):
if not self.user_has_groups('account.group_account_user'):
raise UserError(_('Your are not an accountant !'))
self._pre_compute()

self._sql_report_object()
if self.type == 'account':
Expand Down Expand Up @@ -894,7 +894,7 @@ def _get_name_report(self):
report_name += _(' Balance')
return report_name

def sql_get_line_for_report(self, type_l, report_object=None):
def _sql_get_line_for_report(self, type_l, report_object=None):
query = """SELECT
aml.report_object_id AS report_object_id,
aml.type_view AS type_view,
Expand Down

0 comments on commit 6ca1a80

Please sign in to comment.