1
=== modified file 'bin/addons/board/queries_finance.py'
2
--- bin/addons/board/queries_finance.py	2016-11-10 15:58:28 +0000
3
+++ bin/addons/board/queries_finance.py	2017-01-23 11:00:37 +0000
4
@@ -51,34 +51,20 @@
5
51
account_move.name,
51
account_move.name,
6
52
account_account.code,
52
account_account.code,
7
53
avg(account_move_line.credit_currency-account_move_line.debit_currency) JI,
53
avg(account_move_line.credit_currency-account_move_line.debit_currency) JI,
10
54
sum(account_analytic_line.amount_currency) AJI,
54
sum(COALESCE(account_analytic_line.amount_currency, 0)) AJI,
11
55
abs(abs(avg(account_move_line.debit_currency-account_move_line.credit_currency)) - abs(sum(account_analytic_line.amount_currency))) difference
55
abs(abs(avg(account_move_line.debit_currency-account_move_line.credit_currency)) - abs(sum(COALESCE(account_analytic_line.amount_currency, 0)))) difference
12
56
FROM
56
FROM
19
57
account_move,
57
account_move_line
20
58
account_move_line,
58
JOIN account_move ON account_move.id = account_move_line.move_id
21
59
account_account,
59
JOIN account_account ON account_account.id = account_move_line.account_id
22
60
account_analytic_line,
60
JOIN account_journal ON account_journal.id = account_move.journal_id
23
61
account_journal,
61
JOIN account_period ON account_move.period_id = account_period.id
24
62
account_period
62
LEFT JOIN account_analytic_line on account_analytic_line.move_id = account_move_line.id
25
63
WHERE
63
WHERE
26
64
account_analytic_line.move_id = account_move_line.id and
27
65
account_move_line.move_id = account_move.id AND
28
66
account_move_line.account_id = account_account.id AND
29
67
account_journal.id = account_move.journal_id AND
30
68
account_move.period_id = account_period.id AND
31
69
account_journal.type not in ('system', 'revaluation', 'cur_adj') AND
64
account_journal.type not in ('system', 'revaluation', 'cur_adj') AND
42
70
account_account.code in (
65
account_account.is_analytic_addicted = 't'
33
71
SELECT
34
72
account_account.code
35
73
FROM
36
74
account_account,
37
75
account_account_type
38
76
WHERE
39
77
account_account.user_type = account_account_type.id and
40
78
account_account_type.code in ('income', 'expense')
41
79
)
43
80
GROUP BY account_period.name, account_move.name, account_move_line.id, account_period.date_start, account_account.code
66
GROUP BY account_period.name, account_move.name, account_move_line.id, account_period.date_start, account_account.code
45
81
HAVING abs(abs(avg(account_move_line.debit_currency-account_move_line.credit_currency)) - abs(sum(account_analytic_line.amount_currency))) > 0.00001
67
HAVING abs(abs(avg(account_move_line.debit_currency-account_move_line.credit_currency)) - abs(sum(COALESCE(account_analytic_line.amount_currency, 0)))) > 0.00001
46
82
ORDER BY account_period.date_start, account_move.name"""
68
ORDER BY account_period.date_start, account_move.name"""
47
83
    },
69
    },
48
84
    {
70
    {
49
@@ -89,34 +75,20 @@
50
89
account_move.name,
75
account_move.name,
51
90
account_account.code,
76
account_account.code,
52
91
avg(account_move_line.credit-account_move_line.debit) JI,
77
avg(account_move_line.credit-account_move_line.debit) JI,
55
92
sum(account_analytic_line.amount) AJI,
78
sum(COALESCE(account_analytic_line.amount, 0)) AJI,
56
93
abs(avg(account_move_line.credit-account_move_line.debit) - sum(account_analytic_line.amount)) difference
79
abs(avg(account_move_line.credit-account_move_line.debit) - sum(COALESCE(account_analytic_line.amount, 0))) difference
57
94
FROM
80
FROM
64
95
account_move,
81
account_move_line
65
96
account_move_line,
82
JOIN account_move ON account_move.id = account_move_line.move_id
66
97
account_account,
83
JOIN account_account ON account_account.id = account_move_line.account_id
67
98
account_analytic_line,
84
JOIN account_journal ON account_move.journal_id = account_journal.id
68
99
account_journal,
85
JOIN account_period ON account_period.id = account_move.period_id
69
100
account_period
86
LEFT JOIN account_analytic_line ON account_analytic_line.move_id = account_move_line.id
70
101
WHERE
87
WHERE
71
102
account_analytic_line.move_id = account_move_line.id and
72
103
account_move_line.move_id = account_move.id AND
73
104
account_move_line.account_id = account_account.id AND
74
105
account_journal.id = account_move.journal_id AND
75
106
account_move.period_id = account_period.id AND
76
107
account_journal.type in ('revaluation', 'cur_adj') AND
88
account_journal.type in ('revaluation', 'cur_adj') AND
87
108
account_account.code in (
89
account_account.is_analytic_addicted = 't'
78
109
SELECT
79
110
account_account.code
80
111
FROM
81
112
account_account,
82
113
account_account_type
83
114
WHERE
84
115
account_account.user_type = account_account_type.id and
85
116
account_account_type.code in ('income', 'expense')
86
117
)
88
118
GROUP BY account_period.name, account_move.name, account_move_line.id, account_period.date_start, account_account.code
90
GROUP BY account_period.name, account_move.name, account_move_line.id, account_period.date_start, account_account.code
90
119
HAVING abs(avg(account_move_line.credit-account_move_line.debit) - sum(account_analytic_line.amount)) > 0.00001
91
HAVING abs(avg(account_move_line.credit-account_move_line.debit) - sum(COALESCE(account_analytic_line.amount, 0))) > 0.00001
91
120
order by account_period.date_start, account_move.name"""
92
order by account_period.date_start, account_move.name"""
92
121
    },
93
    },
93
122
    {
94
    {
Status:	Merged
Merge reported by:	jftempo
Merged at revision:	not available
Proposed branch:	lp:~jfb-tempo-consulting/unifield-server/us-2146
Merge into:	lp:unifield-server
Diff against target:	93 lines (+20/-48) 1 file modified bin/addons/board/queries_finance.py (+20/-48)
To merge this branch:	bzr merge lp:~jfb-tempo-consulting/unifield-server/us-2146
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
UniField Reviewer Team		2017-01-23	Pending
Review via email: mp+315340@code.launchpad.net