Unifield Server

Merge lp:~julie-w/unifield-server/US-5202 into lp:unifield-server

  1. US-5202
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5142
Proposed branch: lp:~julie-w/unifield-server/US-5202
Merge into: lp:unifield-server
Diff against target: 17 lines (+3/-3)
1 file modified
bin/addons/register_accounting/report/report_fully_report.py (+3/-3)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5202
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+356813@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/register_accounting/report/report_fully_report.py'
2--- bin/addons/register_accounting/report/report_fully_report.py 2018-08-28 09:57:16 +0000
3+++ bin/addons/register_accounting/report/report_fully_report.py 2018-10-16 13:04:33 +0000
4@@ -237,10 +237,10 @@
5 db = pooler.get_pool(self.cr.dbname)
6 aji_obj = db.get('account.analytic.line')
7 aji_ids = aji_obj.search(self.cr, self.uid, [('move_id', '=', aml.id), ('free_account', '=', free)])
8- ajis = aji_obj.browse(self.cr, self.uid, aji_ids, context={'lang': self.localcontext.get('lang')})
9- return [aji for aji in ajis]
10+ # add the correction lines if any
11+ return self.getAnalyticLines(aji_ids)
12
13- def getManualFreeLines(self, aml, free=False):
14+ def getManualFreeLines(self, aml):
15 """
16 Returns of list of Free1/Free2 Lines linked to the manual JI in parameter
17 """

Subscribers

People subscribed via source and target branches