Unifield Server

Merge lp:~unifield-team/unifield-server/us-1166 into lp:unifield-server

  1. us-1166
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3697
Proposed branch: lp:~unifield-team/unifield-server/us-1166
Merge into: lp:unifield-server
Diff against target: 103 lines (+29/-8)
6 files modified
bin/addons/account/report/account_balance_sheet.py (+4/-2)
bin/addons/account/report/account_general_ledger.py (+4/-2)
bin/addons/account/report/account_profit_loss.py (+4/-2)
bin/addons/account/report/common_report_header.py (+15/-0)
bin/addons/account/wizard/account_report_balance_sheet_view.xml (+1/-1)
bin/addons/account/wizard/account_report_profit_loss_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1166
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+291212@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/account/report/account_balance_sheet.py'
2--- bin/addons/account/report/account_balance_sheet.py 2016-03-31 08:50:19 +0000
3+++ bin/addons/account/report/account_balance_sheet.py 2016-04-07 08:48:25 +0000
4@@ -329,9 +329,11 @@
5 if data['form'].get('instance_ids', False):
6 self.cr.execute('select code from msf_instance where id IN %s',
7 (tuple(data['form']['instance_ids']),))
8+ instances = [x for x, in self.cr.fetchall()]
9 else:
10- self.cr.execute('select code from msf_instance')
11- instances = [x for x, in self.cr.fetchall()]
12+ # US-1166: mission only instances if none provided
13+ instances = self._get_instances(get_code=True,
14+ mission_filter=True)
15 return ', '.join(instances)
16
17 report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account',
18
19=== modified file 'bin/addons/account/report/account_general_ledger.py'
20--- bin/addons/account/report/account_general_ledger.py 2016-03-30 15:23:14 +0000
21+++ bin/addons/account/report/account_general_ledger.py 2016-04-07 08:48:25 +0000
22@@ -437,9 +437,11 @@
23 if data['form'].get('instance_ids', False):
24 self.cr.execute('select code from msf_instance where id IN %s',
25 (tuple(data['form']['instance_ids']),))
26+ instances = [x for x, in self.cr.fetchall()]
27 else:
28- self.cr.execute('select code from msf_instance')
29- instances = [x for x, in self.cr.fetchall()]
30+ # US-1166: mission only instances if none provided
31+ instances = self._get_instances(get_code=True,
32+ mission_filter=True)
33 return ', '.join(instances)
34
35 # internal filter functions
36
37=== modified file 'bin/addons/account/report/account_profit_loss.py'
38--- bin/addons/account/report/account_profit_loss.py 2016-03-31 08:50:19 +0000
39+++ bin/addons/account/report/account_profit_loss.py 2016-04-07 08:48:25 +0000
40@@ -239,9 +239,11 @@
41 if data['form'].get('instance_ids', False):
42 self.cr.execute('select code from msf_instance where id IN %s',
43 (tuple(data['form']['instance_ids']),))
44+ instances = [x for x, in self.cr.fetchall()]
45 else:
46- self.cr.execute('select code from msf_instance')
47- instances = [x for x, in self.cr.fetchall()]
48+ # US-1166: mission only instances if none provided
49+ instances = self._get_instances(get_code=True,
50+ mission_filter=True)
51 return ', '.join(instances)
52
53 report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
54
55=== modified file 'bin/addons/account/report/common_report_header.py'
56--- bin/addons/account/report/common_report_header.py 2016-02-10 09:04:53 +0000
57+++ bin/addons/account/report/common_report_header.py 2016-04-07 08:48:25 +0000
58@@ -192,4 +192,19 @@
59 return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol
60 return ''
61
62+ def _get_instances(self, get_code=False, mission_filter=False):
63+ """
64+ :param get_code: True to return code list vs ids list
65+ :type get_code: boolean
66+ :param mission_filter: only mission instance ?
67+ :type mission_filter: boolean
68+ :rtype : list/False
69+ """
70+ instance_obj = pooler.get_pool(self.cr.dbname).get('msf.instance')
71+ ids = instance_obj.search(self.cr, self.uid,
72+ mission_filter and [('instance_to_display_ids','=',True)] or [])
73+ if not get_code or not ids:
74+ return ids
75+ return [ i.code for i in instance_obj.browse(self.cr, self.uid, ids) ]
76+
77 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
78
79=== modified file 'bin/addons/account/wizard/account_report_balance_sheet_view.xml'
80--- bin/addons/account/wizard/account_report_balance_sheet_view.xml 2016-02-29 11:19:03 +0000
81+++ bin/addons/account/wizard/account_report_balance_sheet_view.xml 2016-04-07 08:48:25 +0000
82@@ -20,7 +20,7 @@
83 <field name="display_account"/>
84 <field name="export_format"/>
85 <newline />
86- <field name="instance_ids">
87+ <field name="instance_ids" domain="[('instance_to_display_ids','=',True)]">
88 <tree noteditable="1" editable="top" string="Proprietary Instances">
89 <field name="code" />
90 <field name="name" />
91
92=== modified file 'bin/addons/account/wizard/account_report_profit_loss_view.xml'
93--- bin/addons/account/wizard/account_report_profit_loss_view.xml 2016-02-08 15:54:05 +0000
94+++ bin/addons/account/wizard/account_report_profit_loss_view.xml 2016-04-07 08:48:25 +0000
95@@ -20,7 +20,7 @@
96 <field name="display_account"/>
97 <field name="export_format"/>
98 <newline/>
99- <field name="instance_ids">
100+ <field name="instance_ids" domain="[('instance_to_display_ids','=',True)]">
101 <tree noteditable="1" editable="top" string="Proprietary Instances">
102 <field name="code" />
103 <field name="name" />

Subscribers

People subscribed via source and target branches

to all changes: