unifield-wm

Merge lp:~unifield-team/unifield-wm/us-661 into lp:unifield-wm

  1. us-661
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2706
Proposed branch: lp:~unifield-team/unifield-wm/us-661
Merge into: lp:unifield-wm
Diff against target: 65 lines (+20/-3)
2 files modified
account_mcdb/report/mcdb_result.py (+17/-0)
account_mcdb/wizard/output_currency_for_export.py (+3/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-661
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283057@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 'account_mcdb/report/mcdb_result.py'
2--- account_mcdb/report/mcdb_result.py 2014-05-13 09:24:27 +0000
3+++ account_mcdb/report/mcdb_result.py 2016-01-19 10:03:12 +0000
4@@ -158,6 +158,8 @@
5 #'getSub': self.getSub,
6 })
7
8+ def getObjects(self, cr, uid, ids, context):
9+ return getIterObjects(self, cr, uid, ids, context)
10 # def getSub(self):
11 # len_ids = len(self.localcontext.get('ids'))
12 # obj = self.pool.get('account.move.line')
13@@ -175,6 +177,12 @@
14 # yield obj.browse(self.cr, self.uid, self.localcontext.get('ids')[old_l:l], context={'output_currency_id': output_cur})
15 # yield []
16
17+ def create(self, cr, uid, ids, data, context=None):
18+ ids = getIds(self, cr, uid, ids, context=context)
19+ if context is None:
20+ context = {}
21+ return super(parser_account_move_line, self).create(cr, uid, ids, data, context=context)
22+
23 def reconcile_name(self, r_id=None, context=None):
24 if not r_id:
25 return None
26@@ -218,6 +226,9 @@
27 def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
28 super(account_analytic_line_report_xls, self).__init__(name, table, rml=rml, parser=parser, header=header, store=store)
29
30+ def getObjects(self, cr, uid, ids, context):
31+ return getIterObjects(self, cr, uid, ids, context)
32+
33 def create(self, cr, uid, ids, data, context=None):
34 ids = getIds(self, cr, uid, ids, limit=65000, context=context)
35 if context is None:
36@@ -254,6 +265,12 @@
37 def getObjects(self, cr, uid, ids, context):
38 return getObjects(self, cr, uid, ids, context)
39
40+ def create(self, cr, uid, ids, data, context=None):
41+ ids = getIds(self, cr, uid, ids, context=context)
42+ if context is None:
43+ context = {}
44+ return super(account_bank_statement_line_report, self).create(cr, uid, ids, data, context=context)
45+
46 account_bank_statement_line_report('report.account.bank.statement.line','account.bank.statement.line','addons/account_mcdb/report/report_account_bank_statement_line.rml')
47
48
49
50=== modified file 'account_mcdb/wizard/output_currency_for_export.py'
51--- account_mcdb/wizard/output_currency_for_export.py 2015-05-21 15:26:49 +0000
52+++ account_mcdb/wizard/output_currency_for_export.py 2016-01-19 10:03:12 +0000
53@@ -122,9 +122,9 @@
54 if wiz.export_selected:
55 datas = {'ids': context.get('active_ids', [])}
56 else:
57- export_obj = self.pool.get(model)
58- args = context.get('search_domain')
59- datas = {'ids': export_obj.search(cr, uid, args, context=context)}
60+ #export_obj = self.pool.get(model)
61+ #args = context.get('search_domain')
62+ #datas = {'ids': export_obj.search(cr, uid, args, context=context)}
63 context['from_domain'] = True
64 # Update context with wizard currency or default currency
65 context.update({'output_currency_id': currency_id})

Subscribers

People subscribed via source and target branches