Yaltik/flectra
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master-multi-branch' into 'master'

Browse Source 
[FIX]: Account report : Multi branch.

See merge request flectra-hq/flectra!13
This commit is contained in:
FlectraHQ Admin 2018-01-25 09:11:28 +00:00
commit 795b88a83d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account/report/account_aged_partner_balance.py
View File

@ -12,7 +12,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
_name = 'report.account.report_agedpartnerbalance' _name = 'report.account.report_agedpartnerbalance'
def _get_partner_move_lines(self, account_type, date_from, target_move, period_length): def _get_partner_move_lines(self, account_type, date_from, target_move, period_length, branch_id):
periods = {} periods = {}
start = datetime.strptime(date_from, "%Y-%m-%d") start = datetime.strptime(date_from, "%Y-%m-%d")
for i in range(5)[::-1]: for i in range(5)[::-1]:
@ -29,7 +29,6 @@ class ReportAgedPartnerBalance(models.AbstractModel):
cr = self.env.cr cr = self.env.cr
user_company = self.env.user.company_id.id user_company = self.env.user.company_id.id
move_state = ['draft', 'posted'] move_state = ['draft', 'posted']
branch_id = data['form'].get('branch_id', False)
branch = '' branch = ''
if branch_id: if branch_id:
branch = 'AND (l.branch_id =' + str(branch_id[0]) + ')' branch = 'AND (l.branch_id =' + str(branch_id[0]) + ')'
@ -218,7 +217,7 @@ class ReportAgedPartnerBalance(models.AbstractModel):
else: else:
account_type = ['payable', 'receivable'] account_type = ['payable', 'receivable']
movelines, total, dummy = self._get_partner_move_lines(account_type, date_from, target_move, data['form']['period_length']) movelines, total, dummy = self._get_partner_move_lines(account_type, date_from, target_move, data['form']['period_length'], data['form'].get('branch_id', False))
return { return {
'doc_ids': self.ids, 'doc_ids': self.ids,
'doc_model': model, 'doc_model': model,