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

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
=== modified file 'bin/addons/register_accounting/report/report_fully_report.py'
--- bin/addons/register_accounting/report/report_fully_report.py 2018-08-28 09:57:16 +0000
+++ bin/addons/register_accounting/report/report_fully_report.py 2018-10-16 13:04:33 +0000
@@ -237,10 +237,10 @@
237 db = pooler.get_pool(self.cr.dbname)237 db = pooler.get_pool(self.cr.dbname)
238 aji_obj = db.get('account.analytic.line')238 aji_obj = db.get('account.analytic.line')
239 aji_ids = aji_obj.search(self.cr, self.uid, [('move_id', '=', aml.id), ('free_account', '=', free)])239 aji_ids = aji_obj.search(self.cr, self.uid, [('move_id', '=', aml.id), ('free_account', '=', free)])
240 ajis = aji_obj.browse(self.cr, self.uid, aji_ids, context={'lang': self.localcontext.get('lang')})240 # add the correction lines if any
241 return [aji for aji in ajis]241 return self.getAnalyticLines(aji_ids)
242242
243 def getManualFreeLines(self, aml, free=False):243 def getManualFreeLines(self, aml):
244 """244 """
245 Returns of list of Free1/Free2 Lines linked to the manual JI in parameter245 Returns of list of Free1/Free2 Lines linked to the manual JI in parameter
246 """246 """

Subscribers

People subscribed via source and target branches