Mentis

Merge lp:~matjaz-6/openerpsl/internal_04_18 into lp:openerpsl/mentis-internal

  1. internal_04_18
  2. Merge into mentis-internal
Proposed by Matjaz Kalic
Status: Merged
Merged at revision: 53
Proposed branch: lp:~matjaz-6/openerpsl/internal_04_18
Merge into: lp:openerpsl/mentis-internal
Diff against target: 55 lines (+4/-7)
2 files modified
mentis_views/mentis_views.xml (+1/-2)
mentis_views/profit_views.py (+3/-5)
To merge this branch: bzr merge lp:~matjaz-6/openerpsl/internal_04_18
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+219152@code.launchpad.net

Description of the change

[FIX] mentis_views (added move_id, name grouping removed)

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 'mentis_views/mentis_views.xml'
2--- mentis_views/mentis_views.xml 2014-04-08 07:13:54 +0000
3+++ mentis_views/mentis_views.xml 2014-05-12 08:19:36 +0000
4@@ -242,8 +242,8 @@
5 <field name="arch" type="xml">
6 <tree string="Journal Items" version="7.0" >
7 <field name="period_id"/>
8+ <field name="move_id"/>
9 <field name="date"/>
10- <field name="name"/>
11 <field name="partner_id"/>
12 <field name="margin_amount" sum="Margin amount"/>
13 <field name="margin_percent" avg="Margin percentage"/>
14@@ -259,7 +259,6 @@
15 <field eval="20" name="priority"/>
16 <field name="arch" type="xml">
17 <search string="Search Journal Items">
18- <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
19 <field name="date"/>
20 <separator/>
21 <filter string="Računalništvo" domain="[('department_id', '=', '1')]" help="Računalništvo" name="racu"/>
22
23=== modified file 'mentis_views/profit_views.py'
24--- mentis_views/profit_views.py 2014-04-08 07:13:54 +0000
25+++ mentis_views/profit_views.py 2014-05-12 08:19:36 +0000
26@@ -29,9 +29,9 @@
27 _columns = {
28 'department_id': fields.char('Department', size=1),
29 'period_id': fields.many2one('account.period', string='Period'),
30+ 'move_id': fields.many2one('account.move', string='Move'),
31 'date': fields.date('Date'),
32 'partner_id': fields.many2one('res.partner', string='Partner'),
33- 'name': fields.char('Desc', size=64),
34 'margin_amount': fields.float('Profit', digits=(6,2)),
35 'margin_percent': fields.float('Perc.%', digits=(6,2), group_operator='avg'),
36 }
37@@ -46,8 +46,6 @@
38 aml.move_id,
39 aml.date,
40 aml.partner_id,
41- aml.name,
42- aml.ref,
43 sum(aml.credit - aml.debit) AS margin_amount,
44 CASE
45 WHEN sum(aml.debit) <> 0.0
46@@ -59,7 +57,7 @@
47 INNER JOIN account_account AS aa ON aa.id = aml.account_id
48 WHERE SUBSTRING(aa.code, 1, 3) IN ('702', '762', '763')
49 AND aml.state = 'valid'
50- GROUP BY SUBSTRING(aa.code, 6, 1), aml.period_id, aml.move_id, aml.date, aml.partner_id, aml.name, aml.ref
51- ORDER BY aml.period_id, aml.move_id, aml.name
52+ GROUP BY SUBSTRING(aa.code, 6, 1), aml.period_id, aml.move_id, aml.date, aml.partner_id
53+ ORDER BY aml.period_id, aml.move_id
54 )""")
55 account_profit_view()

Subscribers

People subscribed via source and target branches