1
=== modified file 'account_financial_report_webkit/__openerp__.py'
2
--- account_financial_report_webkit/__openerp__.py	2014-03-13 10:49:47 +0000
3
+++ account_financial_report_webkit/__openerp__.py	2014-03-18 15:55:27 +0000
4
@@ -30,7 +30,7 @@
5
30
 - Partner ledger
30
 - Partner ledger
6
31
 - Partner balance
31
 - Partner balance
7
32
 - Open invoices report
32
 - Open invoices report
9
33
33
 - Aged Partner Balance
10
34
34
11
35
Main improvements per report:
35
Main improvements per report:
12
36
-----------------------------
36
-----------------------------
13
@@ -100,6 +100,47 @@
14
100
* Subtotal by account and partner
100
* Subtotal by account and partner
15
101
* Alphabetical sorting (same as in partner balance)
101
* Alphabetical sorting (same as in partner balance)
16
102
102
17
103
18
104
Aged Partner Balance: Summary of aged open amount per partner
19
105
20
106
This report is an accounting tool helping in various tasks.
21
107
You can credit control or partner balance provisions computation for instance.
22
108
23
109
The aged balance report allows you to print balances per partner
24
110
like the trial balance but add an extra information :
25
111
26
112
* It will split balances into due amounts
27
113
  (due date not reached à the end date of the report) and overdue amounts
28
114
  Overdue data are also split by period.
29
115
* For each partner following columns will be displayed:
30
116
31
117
  * Total balance (all figures must match with same date partner balance report).
32
118
     This column equals the sum of all following columns)
33
119
34
120
   * Due
35
121
   * Overdue <= 30 days
36
122
   * Overdue <= 60 days
37
123
   * Overdue <= 90 days
38
124
   * Overdue <= 120 days
39
125
   * Older
40
126
41
127
Hypothesis / Contraints of aged partner balance
42
128
43
129
* Overdues columns will be by default  be based on 30 days range fix number of days.
44
130
  This can be changed by changes the RANGES constraint
45
131
* All data will be displayed in company currency
46
132
* When partial payments, the payment must appear in the same colums than the invoice
47
133
  (Except if multiple payment terms)
48
134
* Data granularity: partner (will not display figures at invoices level)
49
135
* The report aggregate data per account with sub-totals
50
136
* Initial balance must be calculated the same way that
51
137
  the partner balance / Ignoring the opening entry
52
138
  in special period (idem open invoice report)
53
139
* Only accounts with internal type payable or receivable are considered
54
140
  (idem open invoice report)
55
141
* If maturity date is null then use move line date
56
142
57
143
58
103
Limitations:
144
Limitations:
59
104
------------
145
------------
60
105
146
61
@@ -126,7 +167,7 @@
62
126
the header and footer are created as text with arguments passed to
167
the header and footer are created as text with arguments passed to
63
127
wkhtmltopdf. The texts are defined inside the report classes.
168
wkhtmltopdf. The texts are defined inside the report classes.
64
128
""",
169
""",
66
129
    'version': '1.0.2',
170
    'version': '1.1.0',
67
130
    'author': 'Camptocamp',
171
    'author': 'Camptocamp',
68
131
    'license': 'AGPL-3',
172
    'license': 'AGPL-3',
69
132
    'category': 'Finance',
173
    'category': 'Finance',
70
@@ -147,6 +188,7 @@
71
147
                   'wizard/trial_balance_wizard_view.xml',
188
                   'wizard/trial_balance_wizard_view.xml',
72
148
                   'wizard/partner_balance_wizard_view.xml',
189
                   'wizard/partner_balance_wizard_view.xml',
73
149
                   'wizard/open_invoices_wizard_view.xml',
190
                   'wizard/open_invoices_wizard_view.xml',
74
191
                   'wizard/aged_partner_balance_wizard.xml',
75
150
                   'wizard/print_journal_view.xml',
192
                   'wizard/print_journal_view.xml',
76
151
                   'report_menus.xml',
193
                   'report_menus.xml',
77
152
                   ],
194
                   ],
78
@@ -155,7 +197,8 @@
79
155
             'tests/partner_ledger.yml',
197
             'tests/partner_ledger.yml',
80
156
             'tests/trial_balance.yml',
198
             'tests/trial_balance.yml',
81
157
             'tests/partner_balance.yml',
199
             'tests/partner_balance.yml',
83
158
             'tests/open_invoices.yml',],
200
             'tests/open_invoices.yml',
84
201
             'tests/aged_trial_balance.yml'],
85
159
    #'tests/account_move_line.yml'
202
    #'tests/account_move_line.yml'
86
160
    'active': False,
203
    'active': False,
87
161
    'installable': True,
204
    'installable': True,
88
162
205
89
=== modified file 'account_financial_report_webkit/report/__init__.py'
90
--- account_financial_report_webkit/report/__init__.py	2013-09-12 20:53:27 +0000
91
+++ account_financial_report_webkit/report/__init__.py	2014-03-18 15:55:27 +0000
92
@@ -9,3 +9,4 @@
93
9
from . import partner_balance
9
from . import partner_balance
94
10
from . import open_invoices
10
from . import open_invoices
95
11
from . import print_journal
11
from . import print_journal
96
12
from . import aged_partner_balance
97
12
13
98
=== added file 'account_financial_report_webkit/report/aged_partner_balance.py'
99
--- account_financial_report_webkit/report/aged_partner_balance.py	1970-01-01 00:00:00 +0000
100
+++ account_financial_report_webkit/report/aged_partner_balance.py	2014-03-18 15:55:27 +0000
101
@@ -0,0 +1,403 @@
102
1
# -*- coding: utf-8 -*-
103
2
##############################################################################
104
3
#
105
4
#    Author: Nicolas Bessi
106
5
#    Copyright 2014 Camptocamp SA
107
6
#
108
7
#    This program is free software: you can redistribute it and/or modify
109
8
#    it under the terms of the GNU Affero General Public License as
110
9
#    published by the Free Software Foundation, either version 3 of the
111
10
#    License, or (at your option) any later version.
112
11
#
113
12
#    This program is distributed in the hope that it will be useful,
114
13
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
115
14
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
116
15
#    GNU Affero General Public License for more details.
117
16
#
118
17
#    You should have received a copy of the GNU Affero General Public License
119
18
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
120
19
#
121
20
##############################################################################
122
21
from __future__ import division
123
22
from datetime import datetime
124
23
125
24
from openerp import pooler
126
25
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
127
26
from openerp.tools.translate import _
128
27
from .open_invoices import PartnersOpenInvoicesWebkit
129
28
from .webkit_parser_header_fix import HeaderFooterTextWebKitParser
130
29
131
30
132
31
def make_ranges(top, offset):
133
32
    """Return sorted days ranges
134
33
135
34
    :param top: maximum overdue day
136
35
    :param offset: offset for ranges
137
36
138
37
    :returns: list of sorted ranges tuples in days
139
38
              eg. [(-100000, 0), (0, offset), (offset, n*offset), ... (top, 100000)]
140
39
    """
141
40
    ranges = [(n, min(n + offset, top)) for n in xrange(0, top, offset)]
142
41
    ranges.insert(0, (-100000000000, 0))
143
42
    ranges.append((top, 100000000000))
144
43
    return ranges
145
44
146
45
#list of overdue ranges
147
46
RANGES = make_ranges(120, 30)
148
47
149
48
150
49
def make_ranges_titles():
151
50
    """Generates title to be used by mako"""
152
51
    titles = [_('Due')]
153
52
    titles += [_(u'Overdue ≤ %s d.') % x[1] for x in RANGES[1:-1]]
154
53
    titles.append(_('Older'))
155
54
    return titles
156
55
157
56
#list of overdue ranges title
158
57
RANGES_TITLES = make_ranges_titles()
159
58
#list of payable journal types
160
59
REC_PAY_TYPE = ('purchase', 'sale')
161
60
#list of refund payable type
162
61
REFUND_TYPE = ('purchase_refund', 'sale_refund')
163
62
INV_TYPE = REC_PAY_TYPE + REFUND_TYPE
164
63
165
64
166
65
class AccountAgedTrialBalanceWebkit(PartnersOpenInvoicesWebkit):
167
66
    """Compute Aged Partner Balance based on result of Open Invoices"""
168
67
169
68
    def __init__(self, cursor, uid, name, context=None):
170
69
        """Constructor, refer to :class:`openerp.report.report_sxw.rml_parse`"""
171
70
        super(AccountAgedTrialBalanceWebkit, self).__init__(cursor, uid, name,
172
71
                                                            context=context)
173
72
        self.pool = pooler.get_pool(self.cr.dbname)
174
73
        self.cursor = self.cr
175
74
        company = self.pool.get('res.users').browse(self.cr, uid, uid,
176
75
                                                    context=context).company_id
177
76
178
77
        header_report_name = ' - '.join((_('Aged Partner Balance'),
179
78
                                         company.currency_id.name))
180
79
181
80
        footer_date_time = self.formatLang(str(datetime.today()),
182
81
                                           date_time=True)
183
82
184
83
        self.localcontext.update({
185
84
            'cr': cursor,
186
85
            'uid': uid,
187
86
            'company': company,
188
87
            'ranges': self._get_ranges(),
189
88
            'ranges_titles': self._get_ranges_titles(),
190
89
            'report_name': _('Aged Partner Balance'),
191
90
            'additional_args': [
192
91
                ('--header-font-name', 'Helvetica'),
193
92
                ('--footer-font-name', 'Helvetica'),
194
93
                ('--header-font-size', '10'),
195
94
                ('--footer-font-size', '6'),
196
95
                ('--header-left', header_report_name),
197
96
                ('--header-spacing', '2'),
198
97
                ('--footer-left', footer_date_time),
199
98
                ('--footer-right', ' '.join((_('Page'), '[page]', _('of'), '[topage]'))),
200
99
                ('--footer-line',),
201
100
            ],
202
101
        })
203
102
204
103
    def _get_ranges(self):
205
104
        """:returns: :cons:`RANGES`"""
206
105
        return RANGES
207
106
208
107
    def _get_ranges_titles(self):
209
108
        """:returns: :cons: `RANGES_TITLES`"""
210
109
        return RANGES_TITLES
211
110
212
111
    def set_context(self, objects, data, ids, report_type=None):
213
112
        """Populate aged_lines, aged_balance, aged_percents attributes
214
113
215
114
        on each account browse record that will be used by mako template
216
115
        The browse record are store in :attr:`objects`
217
116
218
117
        The computation are based on the ledger_lines attribute set on account
219
118
        contained by :attr:`objects`
220
119
221
120
        :attr:`objects` values were previously set by parent class
222
121
        :class: `.open_invoices.PartnersOpenInvoicesWebkit`
223
122
224
123
        :returns: parent :class:`.open_invoices.PartnersOpenInvoicesWebkit`
225
124
                  call to set_context
226
125
227
126
        """
228
127
        res = super(AccountAgedTrialBalanceWebkit, self).set_context(
229
128
            objects,
230
129
            data,
231
130
            ids,
232
131
            report_type=report_type
233
132
        )
234
133
235
134
        for acc in self.objects:
236
135
            acc.aged_lines = {}
237
136
            acc.agged_totals = {}
238
137
            acc.agged_percents = {}
239
138
            for part_id, partner_lines in acc.ledger_lines.items():
240
139
                aged_lines = self.compute_aged_lines(part_id,
241
140
                                                     partner_lines,
242
141
                                                     data)
243
142
                if aged_lines:
244
143
                    acc.aged_lines[part_id] = aged_lines
245
144
            acc.aged_totals = totals = self.compute_totals(acc.aged_lines.values())
246
145
            acc.aged_percents = self.compute_percents(totals)
247
146
        #Free some memory
248
147
        del(acc.ledger_lines)
249
148
        return res
250
149
251
150
    def compute_aged_lines(self, partner_id, ledger_lines, data):
252
151
        """Add property aged_lines to accounts browse records
253
152
254
153
        contained in :attr:`objects` for a given partner
255
154
256
155
        :param: partner_id: current partner
257
156
        :param ledger_lines: generated by parent
258
157
                 :class:`.open_invoices.PartnersOpenInvoicesWebkit`
259
158
260
159
        :returns: dict of computed aged lines
261
160
                  eg {'balance': 1000.0,
262
161
                       'aged_lines': {(90, 120): 0.0, ...}
263
162
264
163
        """
265
164
        lines_to_age = self.filter_lines(partner_id, ledger_lines)
266
165
        res = {}
267
166
        end_date = self._get_end_date(data)
268
167
        aged_lines = dict.fromkeys(RANGES, 0.0)
269
168
        reconcile_lookup = self.get_reconcile_count_lookup(lines_to_age)
270
169
        res['aged_lines'] = aged_lines
271
170
        for line in lines_to_age:
272
171
            compute_method = self.get_compute_method(reconcile_lookup,
273
172
                                                     partner_id,
274
173
                                                     line)
275
174
            delay = compute_method(line, end_date, ledger_lines)
276
175
            classification = self.classify_line(partner_id, delay)
277
176
            aged_lines[classification] += line['debit'] - line['credit']
278
177
        self.compute_balance(res, aged_lines)
279
178
        return res
280
179
281
180
    def _get_end_date(self, data):
282
181
        """Retrieve end date to be used to compute delay.
283
182
284
183
        :param data: data dict send to report contains form dict
285
184
286
185
        :returns: end date to be used to compute overdue delay
287
186
288
187
        """
289
188
        end_date = None
290
189
        date_to = data['form']['date_to']
291
190
        period_to_id = data['form']['period_to']
292
191
        fiscal_to_id = data['form']['fiscalyear_id']
293
192
        if date_to:
294
193
            end_date = date_to
295
194
        elif period_to_id:
296
195
            period_to = self.pool['account.period'].browse(self.cr,
297
196
                                                           self.uid,
298
197
                                                           period_to_id)
299
198
            end_date = period_to.date_stop
300
199
        elif fiscal_to_id:
301
200
            fiscal_to = self.pool['account.fiscalyear'].browse(self.cr,
302
201
                                                               self.uid,
303
202
                                                               fiscal_to_id)
304
203
            end_date = fiscal_to.date_stop
305
204
        else:
306
205
            raise ValueError('End date and end period not available')
307
206
        return end_date
308
207
309
208
    def _compute_delay_from_key(self, key, line, end_date):
310
209
        """Compute overdue delay delta in days for line using attribute in key
311
210
312
211
        delta = end_date - date of key
313
212
314
213
        :param line: current ledger line
315
214
        :param key: date key to be used to compute delta
316
215
        :param end_date: end_date computed for wizard data
317
216
318
217
        :returns: delta in days
319
218
        """
320
219
        from_date = datetime.strptime(line[key], DEFAULT_SERVER_DATE_FORMAT)
321
220
        end_date = datetime.strptime(end_date, DEFAULT_SERVER_DATE_FORMAT)
322
221
        delta = end_date - from_date
323
222
        return delta.days
324
223
325
224
    def compute_delay_from_maturity(self, line, end_date, ledger_lines):
326
225
        """Compute overdue delay delta in days for line using attribute in key
327
226
328
227
        delta = end_date - maturity date
329
228
330
229
        :param line: current ledger line
331
230
        :param end_date: end_date computed for wizard data
332
231
        :param ledger_lines: generated by parent
333
232
                 :class:`.open_invoices.PartnersOpenInvoicesWebkit`
334
233
335
234
        :returns: delta in days
336
235
        """
337
236
        return self._compute_delay_from_key('date_maturity',
338
237
                                            line,
339
238
                                            end_date)
340
239
341
240
    def compute_delay_from_date(self, line, end_date, ledger_lines):
342
241
        """Compute overdue delay delta in days for line using attribute in key
343
242
344
243
        delta = end_date - date
345
244
346
245
        :param line: current ledger line
347
246
        :param end_date: end_date computed for wizard data
348
247
        :param ledger_lines: generated by parent
349
248
                 :class:`.open_invoices.PartnersOpenInvoicesWebkit`
350
249
351
250
        :returns: delta in days
352
251
        """
353
252
        return self._compute_delay_from_key('ldate',
354
253
                                            line,
355
254
                                            end_date)
356
255
357
256
    def compute_delay_from_partial_rec(self, line, end_date, ledger_lines):
358
257
        """Compute overdue delay delta in days for the case where move line
359
258
360
259
        is related to a partial reconcile with more than one reconcile line
361
260
362
261
        :param line: current ledger line
363
262
        :param end_date: end_date computed for wizard data
364
263
        :param ledger_lines: generated by parent
365
264
                 :class:`.open_invoices.PartnersOpenInvoicesWebkit`
366
265
367
266
        :returns: delta in days
368
267
        """
369
268
        sale_lines = [x for x in ledger_lines if x['jtype'] in REC_PAY_TYPE and
370
269
                      line['rec_id'] == x['rec_id']]
371
270
        refund_lines = [x for x in ledger_lines if x['jtype'] in REFUND_TYPE and
372
271
                        line['rec_id'] == x['rec_id']]
373
272
        if len(sale_lines) == 1:
374
273
            reference_line = sale_lines[0]
375
274
        elif len(refund_lines) == 1:
376
275
            reference_line = refund_lines[0]
377
276
        else:
378
277
            reference_line = line
379
278
        key = 'date_maturity' if reference_line.get('date_maturity') else 'ldate'
380
279
        return self._compute_delay_from_key(key,
381
280
                                            reference_line,
382
281
                                            end_date)
383
282
384
283
    def get_compute_method(self, reconcile_lookup, partner_id, line):
385
284
        """Get the function that should compute the delay for a given line
386
285
387
286
        :param reconcile_lookup: dict of reconcile group by id and count
388
287
                                 {rec_id: count of line related to reconcile}
389
288
        :param partner_id: current partner_id
390
289
        :param line: current ledger line generated by parent
391
290
                     :class:`.open_invoices.PartnersOpenInvoicesWebkit`
392
291
393
292
        :returns: function bounded to :class:`.AccountAgedTrialBalanceWebkit`
394
293
395
294
        """
396
295
        if reconcile_lookup.get(line['rec_id'], 0.0) > 1:
397
296
            return self.compute_delay_from_partial_rec
398
297
        elif line['jtype'] in INV_TYPE and line.get('date_maturity'):
399
298
            return self.compute_delay_from_maturity
400
299
        else:
401
300
            return self.compute_delay_from_date
402
301
403
302
    def line_is_valid(self, partner_id, line):
404
303
        """Predicate hook that allows to filter line to be treated
405
304
406
305
        :param partner_id: current partner_id
407
306
        :param line: current ledger line generated by parent
408
307
                     :class:`.open_invoices.PartnersOpenInvoicesWebkit`
409
308
410
309
        :returns: boolean True if line is allowed
411
310
        """
412
311
        return True
413
312
414
313
    def filter_lines(self, partner_id, lines):
415
314
        """Filter ledger lines that have to be treated
416
315
417
316
        :param partner_id: current partner_id
418
317
        :param lines: ledger_lines related to current partner
419
318
                      and generated by parent
420
319
                      :class:`.open_invoices.PartnersOpenInvoicesWebkit`
421
320
422
321
        :returns: list of allowed lines
423
322
424
323
        """
425
324
        return [x for x in lines if self.line_is_valid(partner_id, x)]
426
325
427
326
    def classify_line(self, partner_id, overdue_days):
428
327
        """Return the overdue range for a given delay
429
328
430
329
        We loop from smaller range to higher
431
330
        This should be the most effective solution as generaly
432
331
        customer tend to have one or two month of delay
433
332
434
333
        :param overdue_days: delay in days
435
334
        :param partner_id: current partner_id
436
335
437
336
        :returns: the correct range in :const:`RANGES`
438
337
439
338
        """
440
339
        for drange in RANGES:
441
340
            if overdue_days <= drange[1]:
442
341
                return drange
443
342
        return drange
444
343
445
344
    def compute_balance(self, res, aged_lines):
446
345
        """Compute the total balance of aged line
447
346
        for given account"""
448
347
        res['balance'] = sum(aged_lines.values())
449
348
450
349
    def compute_totals(self, aged_lines):
451
350
        """Compute the totals for an account
452
351
453
352
        :param aged_lines: dict of aged line taken from the
454
353
                           property added to account record
455
354
456
355
        :returns: dict of total {'balance':1000.00, (30, 60): 3000,...}
457
356
458
357
        """
459
358
        totals = {}
460
359
        totals['balance'] = sum(x.get('balance', 0.0) for
461
360
                                x in aged_lines)
462
361
        aged_ranges = [x.get('aged_lines', {}) for x in aged_lines]
463
362
        for drange in RANGES:
464
363
            totals[drange] = sum(x.get(drange, 0.0) for x in aged_ranges)
465
364
        return totals
466
365
467
366
    def compute_percents(self, totals):
468
367
        percents = {}
469
368
        base = totals['balance'] or 1.0
470
369
        for drange in RANGES:
471
370
            percents[drange] = (totals[drange] / base) * 100.0
472
371
        return percents
473
372
474
373
    def get_reconcile_count_lookup(self, lines):
475
374
        """Compute an lookup dict
476
375
477
376
        It contains has partial reconcile id as key and the count of lines
478
377
        related to the reconcile id
479
378
480
379
        :param: a list of ledger lines generated by parent
481
380
                :class:`.open_invoices.PartnersOpenInvoicesWebkit`
482
381
483
382
        :retuns: lookup dict {ṛec_id: count}
484
383
485
384
        """
486
385
        # possible bang if l_ids is really long.
487
386
        # We have the same weakness in common_report ...
488
387
        # but it seems not really possible for a partner
489
388
        # So I'll keep that option.
490
389
        l_ids = tuple(x['id'] for x in lines)
491
390
        sql = ("SELECT reconcile_partial_id, COUNT(*) FROM account_move_line"
492
391
               "   WHERE reconcile_partial_id IS NOT NULL"
493
392
               "   AND id in %s"
494
393
               "   GROUP BY reconcile_partial_id")
495
394
        self.cr.execute(sql, (l_ids,))
496
395
        res = self.cr.fetchall()
497
396
        return dict((x[0], x[1]) for x in res)
498
397
499
398
HeaderFooterTextWebKitParser(
500
399
    'report.account.account_aged_trial_balance_webkit',
501
400
    'account.account',
502
401
    'addons/account_financial_report_webkit/report/templates/aged_trial_webkit.mako',
503
402
    parser=AccountAgedTrialBalanceWebkit,
504
403
)
505
0
404
506
=== modified file 'account_financial_report_webkit/report/common_reports.py'
507
--- account_financial_report_webkit/report/common_reports.py	2013-12-17 16:16:37 +0000
508
+++ account_financial_report_webkit/report/common_reports.py	2014-03-18 15:55:27 +0000
509
@@ -30,7 +30,7 @@
510
30
30
511
31
_logger = logging.getLogger('financial.reports.webkit')
31
_logger = logging.getLogger('financial.reports.webkit')
512
32
32
514
33
33
MAX_MONSTER_SLICE = 50000
515
34
class CommonReportHeaderWebkit(common_report_header):
34
class CommonReportHeaderWebkit(common_report_header):
516
35
    """Define common helper for financial report"""
35
    """Define common helper for financial report"""
517
36
36
518
@@ -433,6 +433,14 @@
519
433
            raise osv.except_osv(_('No valid filter'), _('Please set a valid time filter'))
433
            raise osv.except_osv(_('No valid filter'), _('Please set a valid time filter'))
520
434
434
521
435
    def _get_move_line_datas(self, move_line_ids, order='per.special DESC, l.date ASC, per.date_start ASC, m.name ASC'):
435
    def _get_move_line_datas(self, move_line_ids, order='per.special DESC, l.date ASC, per.date_start ASC, m.name ASC'):
522
436
        # Possible bang if move_line_ids is too long
523
437
        # We can not slice here as we have to do the sort.
524
438
        # If slice has to be done it means that we have to reorder in python
525
439
        # after all is finished. That quite crapy...
526
440
        # We have a defective desing here (mea culpa) that should be fixed
527
441
        #
528
442
        # TODO improve that by making a better domain or if not possible
529
443
        # by using python sort
530
436
        if not move_line_ids:
444
        if not move_line_ids:
531
437
            return []
445
            return []
532
438
        if not isinstance(move_line_ids, list):
446
        if not isinstance(move_line_ids, list):
533
@@ -441,6 +449,7 @@
534
441
SELECT l.id AS id,
449
SELECT l.id AS id,
535
442
            l.date AS ldate,
450
            l.date AS ldate,
536
443
            j.code AS jcode ,
451
            j.code AS jcode ,
537
452
            j.type AS jtype,
538
444
            l.currency_id,
453
            l.currency_id,
539
445
            l.account_id,
454
            l.account_id,
540
446
            l.amount_currency,
455
            l.amount_currency,
541
@@ -455,7 +464,8 @@
542
455
            l.partner_id AS lpartner_id,
464
            l.partner_id AS lpartner_id,
543
456
            p.name AS partner_name,
465
            p.name AS partner_name,
544
457
            m.name AS move_name,
466
            m.name AS move_name,
546
458
             COALESCE(partialrec.name, fullrec.name, '') AS rec_name,
467
            COALESCE(partialrec.name, fullrec.name, '') AS rec_name,
547
468
            COALESCE(partialrec.id, fullrec.id, NULL) AS rec_id,
548
459
            m.id AS move_id,
469
            m.id AS move_id,
549
460
            c.name AS currency_code,
470
            c.name AS currency_code,
550
461
            i.id AS invoice_id,
471
            i.id AS invoice_id,
551
462
472
552
=== modified file 'account_financial_report_webkit/report/open_invoices.py'
553
--- account_financial_report_webkit/report/open_invoices.py	2013-11-03 12:55:27 +0000
554
+++ account_financial_report_webkit/report/open_invoices.py	2014-03-18 15:55:27 +0000
555
@@ -93,7 +93,6 @@
556
93
        """Populate a ledger_lines attribute on each browse record that will be used
93
        """Populate a ledger_lines attribute on each browse record that will be used
557
94
        by mako template"""
94
        by mako template"""
558
95
        new_ids = data['form']['chart_account_id']
95
        new_ids = data['form']['chart_account_id']
559
96
560
97
        # Account initial balance memoizer
96
        # Account initial balance memoizer
561
98
        init_balance_memoizer = {}
97
        init_balance_memoizer = {}
562
99
        # Reading form
98
        # Reading form
563
100
99
564
=== modified file 'account_financial_report_webkit/report/report.xml'
565
--- account_financial_report_webkit/report/report.xml	2013-12-16 09:37:19 +0000
566
+++ account_financial_report_webkit/report/report.xml	2014-03-18 15:55:27 +0000
567
@@ -14,23 +14,16 @@
568
14
            <field name="name">General Ledger Webkit</field>
14
            <field name="name">General Ledger Webkit</field>
569
15
            <field name="report_rml">account_financial_report_webkit/report/templates/account_report_general_ledger.mako</field>
15
            <field name="report_rml">account_financial_report_webkit/report/templates/account_report_general_ledger.mako</field>
570
16
            <field name="report_file">account_financial_report_webkit/report/templates/account_report_general_ledger.mako</field>
16
            <field name="report_file">account_financial_report_webkit/report/templates/account_report_general_ledger.mako</field>
572
17
        </record> 
17
        </record>
573
18
574
18
        <record id="property_account_report_general_ledger_webkit" model="ir.property">
19
        <record id="property_account_report_general_ledger_webkit" model="ir.property">
575
19
            <field name="name">account_report_general_ledger_webkit</field>
20
            <field name="name">account_report_general_ledger_webkit</field>
576
20
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
21
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
577
21
            <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))" model="ir.header_webkit" name="value"/>
22
            <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))" model="ir.header_webkit" name="value"/>
578
22
            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_general_ledger_webkit'))" model="ir.actions.report.xml" name="res_id"/>
23
            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_general_ledger_webkit'))" model="ir.actions.report.xml" name="res_id"/>
579
23
        </record>
24
        </record>
590
24
        <!-- waiting the fix 
25
591
25
        <report auto="False" 
26
        <!-- we do not use report tag has we can not set header ref -->
582
26
            id="account_report_partner_ledger_webkit" 
583
27
            model="account.account" 
584
28
            name="account.account_report_partner_ledger_webkit"  
585
29
            file="account_financial_report_webkit/report/templates/account_report_partner_ledger.mako" 
586
30
            string="General Ledger Webkit"
587
31
            report_type="webkit"/>  -->
588
32
            
589
33
                <!-- we do not use report tag has we can not set header ref -->
592
34
       <record id="account_report_partners_ledger_webkit" model="ir.actions.report.xml">
27
       <record id="account_report_partners_ledger_webkit" model="ir.actions.report.xml">
593
35
            <field name="report_type">webkit</field>
28
            <field name="report_type">webkit</field>
594
36
            <field name="report_name">account.account_report_partners_ledger_webkit</field>
29
            <field name="report_name">account.account_report_partners_ledger_webkit</field>
595
@@ -44,6 +37,7 @@
596
44
            <field name="report_rml">account_financial_report_webkit/report/templates/account_report_partners_ledger.mako</field>
37
            <field name="report_rml">account_financial_report_webkit/report/templates/account_report_partners_ledger.mako</field>
597
45
            <field name="report_file">account_financial_report_webkit/report/templates/account_report_partners_ledger.mako</field>
38
            <field name="report_file">account_financial_report_webkit/report/templates/account_report_partners_ledger.mako</field>
598
46
        </record>
39
        </record>
599
40
600
47
        <record id="property_account_report_partners_ledger_webkit" model="ir.property">
41
        <record id="property_account_report_partners_ledger_webkit" model="ir.property">
601
48
            <field name="name">account_report_partners_ledger_webkit</field>
42
            <field name="name">account_report_partners_ledger_webkit</field>
602
49
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
43
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
603
@@ -64,6 +58,7 @@
604
64
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_trial_balance.mako</field>
58
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_trial_balance.mako</field>
605
65
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_trial_balance.mako</field>
59
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_trial_balance.mako</field>
606
66
         </record>
60
         </record>
607
61
608
67
        <record id="property_account_report_trial_balance_webkit" model="ir.property">
62
        <record id="property_account_report_trial_balance_webkit" model="ir.property">
609
68
            <field name="name">account_report_trial_balance_webkit</field>
63
            <field name="name">account_report_trial_balance_webkit</field>
610
69
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
64
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
611
@@ -84,6 +79,7 @@
612
84
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_partner_balance.mako</field>
79
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_partner_balance.mako</field>
613
85
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_partner_balance.mako</field>
80
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_partner_balance.mako</field>
614
86
         </record>
81
         </record>
615
82
616
87
        <record id="property_account_report_partner_balance_webkit" model="ir.property">
83
        <record id="property_account_report_partner_balance_webkit" model="ir.property">
617
88
            <field name="name">account_report_partner_balance_webkit</field>
84
            <field name="name">account_report_partner_balance_webkit</field>
618
89
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
85
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
619
@@ -104,6 +100,7 @@
620
104
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_open_invoices.mako</field>
100
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_open_invoices.mako</field>
621
105
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_open_invoices.mako</field>
101
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_open_invoices.mako</field>
622
106
         </record>
102
         </record>
623
103
624
107
        <record id="property_account_report_open_invoices_webkit" model="ir.property">
104
        <record id="property_account_report_open_invoices_webkit" model="ir.property">
625
108
            <field name="name">account_report_open_invoices_webkit</field>
105
            <field name="name">account_report_open_invoices_webkit</field>
626
109
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
106
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
627
@@ -111,6 +108,31 @@
628
111
            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_open_invoices_webkit'))" model="ir.actions.report.xml" name="res_id"/>
108
            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_open_invoices_webkit'))" model="ir.actions.report.xml" name="res_id"/>
629
112
        </record>
109
        </record>
630
113
110
631
111
        <record id="account_report_aged_trial_blanance_webkit" model="ir.actions.report.xml">
632
112
             <field name="report_type">webkit</field>
633
113
             <field name="report_name">account.account_aged_trial_balance_webkit</field>
634
114
             <field eval="[(6,0,[])]" name="groups_id"/>
635
115
             <field eval="0" name="multi"/>
636
116
             <field eval="0" name="auto"/>
637
117
             <field eval="1" name="header"/>
638
118
             <field name="model">account.account</field>
639
119
             <field name="type">ir.actions.report.xml</field>
640
120
             <field name="name">Aged Partner Balance</field>
641
121
             <field name="report_rml">account_financial_report_webkit/report/templates/aged_trial_webkit.mako</field>
642
122
             <field name="report_file">account_financial_report_webkit/report/templates/aged_trial_webkit.mako</field>
643
123
         </record>
644
124
645
125
        <record id="property_account_report_aged_trial_balance_webkit" model="ir.property">
646
126
            <field name="name">account_aged_trial_balance_webkit</field>
647
127
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
648
128
            <field eval="'ir.header_webkit,'+str(ref('account_financial_report_webkit.financial_landscape_header'))"
649
129
                   model="ir.header_webkit"
650
130
                   name="value"/>
651
131
            <field eval="'ir.actions.report.xml,'+str(ref('account_financial_report_webkit.account_report_aged_trial_blanance_webkit'))"
652
132
                   model="ir.actions.report.xml"
653
133
                   name="res_id"/>
654
134
        </record>
655
135
656
114
        <record id="account_report_print_journal_webkit" model="ir.actions.report.xml">
136
        <record id="account_report_print_journal_webkit" model="ir.actions.report.xml">
657
115
             <field name="report_type">webkit</field>
137
             <field name="report_type">webkit</field>
658
116
             <field name="report_name">account.account_report_print_journal_webkit</field>
138
             <field name="report_name">account.account_report_print_journal_webkit</field>
659
@@ -124,6 +146,7 @@
660
124
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field>
146
             <field name="report_rml">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field>
661
125
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field>
147
             <field name="report_file">account_financial_report_webkit/report/templates/account_report_print_journal.mako</field>
662
126
         </record>
148
         </record>
663
149
664
127
        <record id="property_account_report_print_journal_webkit" model="ir.property">
150
        <record id="property_account_report_print_journal_webkit" model="ir.property">
665
128
            <field name="name">account_report_print_journal_webkit</field>
151
            <field name="name">account_report_print_journal_webkit</field>
666
129
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
152
            <field name="fields_id" ref="report_webkit.field_ir_act_report_xml_webkit_header"/>
667
130
153
668
=== added file 'account_financial_report_webkit/report/templates/aged_trial_webkit.mako'
669
--- account_financial_report_webkit/report/templates/aged_trial_webkit.mako	1970-01-01 00:00:00 +0000
670
+++ account_financial_report_webkit/report/templates/aged_trial_webkit.mako	2014-03-18 15:55:27 +0000
671
@@ -0,0 +1,155 @@
672
1
## -*- coding: utf-8 -*-
673
2
<!DOCTYPE html SYSTEM
674
3
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
675
4
<html xmlns="http://www.w3.org/1999/xhtml">
676
5
    <head>
677
6
        <style type="text/css">
678
7
            .overflow_ellipsis {
679
8
                text-overflow: ellipsis;
680
9
                overflow: hidden;
681
10
                white-space: nowrap;
682
11
            }
683
12
684
13
            .open_invoice_previous_line {
685
14
                font-style: italic;
686
15
            }
687
16
688
17
            .percent_line {
689
18
                font-style: italic;
690
19
            }
691
20
692
21
            .amount {
693
22
                text-align:right;
694
23
            }
695
24
696
25
            .classif_title {
697
26
                text-align:right;
698
27
            }
699
28
700
29
            .classif{
701
30
              width: ${700/len(ranges)}px;
702
31
            }
703
32
            .total{
704
33
               font-weight:bold;
705
34
            }
706
35
            ${css}
707
36
        </style>
708
37
    </head>
709
38
710
39
    <%!
711
40
    def amount(text):
712
41
        # replace by a non-breaking hyphen (it will not word-wrap between hyphen and numbers)
713
42
        return text.replace('-', '&#8209;')
714
43
    %>
715
44
    <body>
716
45
        <%setLang(user.lang)%>
717
46
718
47
        <div class="act_as_table data_table">
719
48
            <div class="act_as_row labels">
720
49
                <div class="act_as_cell">${_('Chart of Account')}</div>
721
50
                <div class="act_as_cell">${_('Fiscal Year')}</div>
722
51
                <div class="act_as_cell">
723
52
                    %if filter_form(data) == 'filter_date':
724
53
                        ${_('Dates Filter')}
725
54
                    %else:
726
55
                        ${_('Periods Filter')}
727
56
                    %endif
728
57
                </div>
729
58
                <div class="act_as_cell">${_('Clearance Date')}</div>
730
59
                <div class="act_as_cell">${_('Accounts Filter')}</div>
731
60
                <div class="act_as_cell">${_('Target Moves')}</div>
732
61
733
62
            </div>
734
63
            <div class="act_as_row">
735
64
                <div class="act_as_cell">${ chart_account.name }</div>
736
65
                <div class="act_as_cell">${ fiscalyear.name if fiscalyear else '-' }</div>
737
66
                <div class="act_as_cell">
738
67
                    ${_('From:')}
739
68
                    %if filter_form(data) == 'filter_date':
740
69
                        ${formatLang(start_date, date=True) if start_date else u'' }
741
70
                    %else:
742
71
                        ${start_period.name if start_period else u''}
743
72
                    %endif
744
73
                    ${_('To:')}
745
74
                    %if filter_form(data) == 'filter_date':
746
75
                        ${ formatLang(stop_date, date=True) if stop_date else u'' }
747
76
                    %else:
748
77
                        ${stop_period.name if stop_period else u'' }
749
78
                    %endif
750
79
                </div>
751
80
                <div class="act_as_cell">${ formatLang(date_until, date=True) }</div>
752
81
                <div class="act_as_cell">
753
82
                    %if partner_ids:
754
83
                        ${_('Custom Filter')}
755
84
                    %else:
756
85
                        ${ display_partner_account(data) }
757
86
                    %endif
758
87
                </div>
759
88
                <div class="act_as_cell">${ display_target_move(data) }</div>
760
89
            </div>
761
90
        </div>
762
91
        %for acc in objects:
763
92
          %if acc.aged_lines:
764
93
          <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${acc.code} - ${acc.name}</div>
765
94
766
95
767
96
768
97
                <div class="act_as_table list_table" style="margin-top: 5px;">
769
98
                  <div class="act_as_thead">
770
99
                    <div class="act_as_row labels">
771
100
                      ## partner
772
101
                      <div class="act_as_cell first_column" style="width: 60px;">${_('Partner')}</div>
773
102
                      ## code
774
103
                      <div class="act_as_cell" style="width: 70px;">${_('code')}</div>
775
104
                      ## balance
776
105
                      <div class="act_as_cell classif_title" style="width: 70px;">${_('balance')}</div>
777
106
                      ## Classifications
778
107
                      %for title in ranges_titles:
779
108
                        <div class="act_as_cell classif classif_title">${title}</div>
780
109
                      %endfor
781
110
                    </div>
782
111
                  </div>
783
112
                  <div class="act_as_tbody">
784
113
                    %for partner_name, p_id, p_ref, p_name in acc.partners_order:
785
114
                       %if acc.aged_lines.get(p_id):
786
115
                       <div class="act_as_row lines">
787
116
                         <%line = acc.aged_lines[p_id]%>
788
117
                         <%percents = acc.aged_percents%>
789
118
                         <%totals = acc.aged_totals%>
790
119
                           <div class="act_as_cell first_column">${partner_name}</div>
791
120
                           <div class="act_as_cell">${p_ref or ''}</div>
792
121
793
122
                           <div class="act_as_cell amount">${formatLang(line.get('balance') or 0.0) | amount}</div>
794
123
                            %for classif in ranges:
795
124
                              <div class="act_as_cell classif amount">
796
125
                                ${formatLang(line['aged_lines'][classif] or 0.0) | amount}
797
126
                              </div>
798
127
                            %endfor
799
128
                       </div>
800
129
                       %endif
801
130
                    %endfor
802
131
                    <div class="act_as_row labels">
803
132
                      <div class="act_as_cell total">${_('Total')}</div>
804
133
                      <div class="act_as_cell"></div>
805
134
                      <div class="act_as_cell amount classif total">${formatLang(totals['balance']) | amount}</div>
806
135
                      %for classif in ranges:
807
136
                        <div class="act_as_cell amount classif total">${formatLang(totals[classif]) | amount}</div>
808
137
                      %endfor
809
138
                    </div>
810
139
811
140
                    <div class="act_as_row">
812
141
                      <div class="act_as_cell"><b>${_('Percents')}</b></div>
813
142
                      <div class="act_as_cell"></div>
814
143
                      <div class="act_as_cell"></div>
815
144
                      %for classif in ranges:
816
145
                        <div class="act_as_cell amount percent_line  classif">${formatLang(percents[classif]) | amount}%</div>
817
146
                      %endfor
818
147
                    </div>
819
148
                  </div>
820
149
                  <br/>
821
150
822
151
                 %endif
823
152
              %endfor
824
153
        </div>
825
154
    </body>
826
155
</html>
827
0
156
828
=== modified file 'account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html'
829
--- account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html	2013-11-21 15:55:29 +0000
830
+++ account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html	2014-03-18 15:55:27 +0000
831
@@ -9,7 +9,7 @@
832
9
    %>
9
    %>
833
10
10
834
11
    <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${account.code} - ${account.name}</div>
11
    <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${account.code} - ${account.name}</div>
836
12
    
12
837
13
    %for partner_name, p_id, p_ref, p_name in account.partners_order:
13
    %for partner_name, p_id, p_ref, p_name in account.partners_order:
838
14
    <%
14
    <%
839
15
      total_debit = 0.0
15
      total_debit = 0.0
840
@@ -18,7 +18,7 @@
841
18
      cumul_balance_curr = 0.0
18
      cumul_balance_curr = 0.0
842
19
19
843
20
      part_cumul_balance = 0.0
20
      part_cumul_balance = 0.0
845
21
      part_cumul_balance_curr = 0.0 
21
      part_cumul_balance_curr = 0.0
846
22
    %>
22
    %>
847
23
    <div class="act_as_table list_table" style="margin-top: 5px;">
23
    <div class="act_as_table list_table" style="margin-top: 5px;">
848
24
        <div class="act_as_caption account_title">
24
        <div class="act_as_caption account_title">
849
25
25
850
=== modified file 'account_financial_report_webkit/report/webkit_parser_header_fix.py'
851
--- account_financial_report_webkit/report/webkit_parser_header_fix.py	2014-01-14 09:37:20 +0000
852
+++ account_financial_report_webkit/report/webkit_parser_header_fix.py	2014-03-18 15:55:27 +0000
853
@@ -160,7 +160,6 @@
854
160
    # override needed to keep the attachments' storing procedure
160
    # override needed to keep the attachments' storing procedure
855
161
    def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None):
161
    def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None):
856
162
        """generate the PDF"""
162
        """generate the PDF"""
857
163
858
164
        if context is None:
163
        if context is None:
859
165
            context={}
164
            context={}
860
166
        htmls = []
165
        htmls = []
861
167
166
862
=== modified file 'account_financial_report_webkit/report_menus.xml'
863
--- account_financial_report_webkit/report_menus.xml	2014-01-13 09:33:02 +0000
864
+++ account_financial_report_webkit/report_menus.xml	2014-03-18 15:55:27 +0000
865
@@ -18,6 +18,10 @@
866
18
            parent="account.next_id_22" action="action_account_partner_balance_menu_webkit"
18
            parent="account.next_id_22" action="action_account_partner_balance_menu_webkit"
867
19
            groups="account.group_account_manager,account.group_account_user" id="account.menu_account_partner_balance_report"/>
19
            groups="account.group_account_manager,account.group_account_user" id="account.menu_account_partner_balance_report"/>
868
20
20
869
21
        <menuitem icon="STOCK_PRINT" name="Aged Partner Balance"
870
22
            parent="account.next_id_22" action="action_account_aged_trial_balance_menu_webkit"
871
23
            groups="account.group_account_manager,account.group_account_user" id="account.menu_aged_trial_balance"/>
872
24
873
21
        <menuitem icon="STOCK_PRINT" name="Open Invoices"
25
        <menuitem icon="STOCK_PRINT" name="Open Invoices"
874
22
            parent="account.next_id_22" action="action_account_open_invoices_menu_webkit"
26
            parent="account.next_id_22" action="action_account_open_invoices_menu_webkit"
875
23
            groups="account.group_account_manager,account.group_account_user" id="menu_account_open_invoices"/>
27
            groups="account.group_account_manager,account.group_account_user" id="menu_account_open_invoices"/>
876
24
28
877
=== added file 'account_financial_report_webkit/tests/aged_trial_balance.yml'
878
--- account_financial_report_webkit/tests/aged_trial_balance.yml	1970-01-01 00:00:00 +0000
879
+++ account_financial_report_webkit/tests/aged_trial_balance.yml	2014-03-18 15:55:27 +0000
880
@@ -0,0 +1,60 @@
881
1
-
882
2
  In order to test the PDF Aged Partner Balance Report webkit wizard I will print report with default setting
883
3
-
884
4
    !python {model: account.account}: |
885
5
        from datetime import datetime
886
6
        ctx={}
887
7
        data_dict = {'chart_account_id':ref('account.chart0'), 'until_date': '%s-12-31' %(datetime.now().year)}
888
8
        from tools import test_reports
889
9
        test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
890
10
891
11
-
892
12
  In order to test the PDF Aged Partner Balance Report webkit wizard I will print report with filters and currency
893
13
-
894
14
    !python {model: account.account}: |
895
15
        from datetime import datetime
896
16
        ctx={}
897
17
        data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
898
18
                     'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
899
19
                     'amount_currency': True, 'result_selection': 'customer_supplier'}
900
20
        from tools import test_reports
901
21
        test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
902
22
903
23
-
904
24
  In order to test the PDF Aged Partner Balance Report webkit wizard I will print report with filters on partners
905
25
-
906
26
    !python {model: account.account}: |
907
27
        from datetime import datetime
908
28
        ctx={}
909
29
        data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
910
30
                     'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
911
31
                     'amount_currency': True, 'result_selection': 'customer_supplier',
912
32
                     'partner_ids': [ref('base.res_partner_2'), ref('base.res_partner_1')]}
913
33
        from tools import test_reports
914
34
        test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
915
35
916
36
-
917
37
  In order to test the PDF Aged Partner Balance Report webkit wizard I will print report with filters on periods
918
38
-
919
39
    !python {model: account.account}: |
920
40
        from datetime import datetime
921
41
        ctx={}
922
42
        data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
923
43
                     'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
924
44
                     'amount_currency': True, 'result_selection': 'customer_supplier',
925
45
                     'filter': 'filter_period', 'period_from': ref('account.period_1'), 'period_to': ref('account.period_12')}
926
46
        from tools import test_reports
927
47
        test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
928
48
929
49
-
930
50
  In order to test the PDF Aged Partner Balance Report webkit wizard I will print report with filters on dates
931
51
-
932
52
    !python {model: account.account}: |
933
53
        from datetime import datetime
934
54
        ctx={}
935
55
        data_dict = {'chart_account_id':ref('account.chart0'), 'fiscalyear_id': ref('account.data_fiscalyear'),
936
56
                     'until_date': '%s-12-31' %(datetime.now().year), 'target_move': 'posted',
937
57
                     'amount_currency': True, 'result_selection': 'customer_supplier',
938
58
                     'filter': 'filter_date', 'date_from': '%s-01-01' %(datetime.now().year), 'date_to': '%s-12-31' %(datetime.now().year)}
939
59
        from tools import test_reports
940
60
        test_reports.try_report_action(cr, uid, 'action_account_aged_trial_balance_menu_webkit',wiz_data=data_dict, context=ctx, our_module='account_financial_report_webkit')
941
0
61
942
=== modified file 'account_financial_report_webkit/wizard/__init__.py'
943
--- account_financial_report_webkit/wizard/__init__.py	2013-09-12 20:53:27 +0000
944
+++ account_financial_report_webkit/wizard/__init__.py	2014-03-18 15:55:27 +0000
945
@@ -27,3 +27,4 @@
946
27
from . import partner_balance_wizard
27
from . import partner_balance_wizard
947
28
from . import open_invoices_wizard
28
from . import open_invoices_wizard
948
29
from . import print_journal
29
from . import print_journal
949
30
from . import aged_partner_balance_wizard
950
30
31
951
=== added file 'account_financial_report_webkit/wizard/aged_partner_balance_wizard.py'
952
--- account_financial_report_webkit/wizard/aged_partner_balance_wizard.py	1970-01-01 00:00:00 +0000
953
+++ account_financial_report_webkit/wizard/aged_partner_balance_wizard.py	2014-03-18 15:55:27 +0000
954
@@ -0,0 +1,39 @@
955
1
# -*- coding: utf-8 -*-
956
2
##############################################################################
957
3
#
958
4
#    Author: Nicolas Bessi
959
5
#    Copyright 2014 Camptocamp SA
960
6
#
961
7
#    This program is free software: you can redistribute it and/or modify
962
8
#    it under the terms of the GNU Affero General Public License as
963
9
#    published by the Free Software Foundation, either version 3 of the
964
10
#    License, or (at your option) any later version.
965
11
#
966
12
#    This program is distributed in the hope that it will be useful,
967
13
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
968
14
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
969
15
#    GNU Affero General Public License for more details.
970
16
#
971
17
#    You should have received a copy of the GNU Affero General Public License
972
18
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
973
19
#
974
20
##############################################################################
975
21
from openerp.osv import orm
976
22
977
23
978
24
class AccountAgedTrialBalance(orm.TransientModel):
979
25
    """Will launch age partner balance report.
980
26
    This report is based on Open Invoice Report
981
27
    and share a lot of knowledge with him
982
28
    """
983
29
984
30
    _inherit = "open.invoices.webkit"
985
31
    _name = "account.aged.trial.balance.webkit"
986
32
    _description = "Aged partner balanced"
987
33
988
34
    def _print_report(self, cr, uid, ids, data, context=None):
989
35
        # we update form with display account value
990
36
        data = self.pre_print_report(cr, uid, ids, data, context=context)
991
37
        return {'type': 'ir.actions.report.xml',
992
38
                'report_name': 'account.account_aged_trial_balance_webkit',
993
39
                'datas': data}
994
0
40
995
=== added file 'account_financial_report_webkit/wizard/aged_partner_balance_wizard.xml'
996
--- account_financial_report_webkit/wizard/aged_partner_balance_wizard.xml	1970-01-01 00:00:00 +0000
997
+++ account_financial_report_webkit/wizard/aged_partner_balance_wizard.xml	2014-03-18 15:55:27 +0000
998
@@ -0,0 +1,72 @@
999
1
<?xml version="1.0" encoding="utf-8"?>
1000
2
<openerp>
1001
3
  <data>
1002
4
1003
5
    <record id="account_aged_trial_balance_webkit" model="ir.ui.view">
1004
6
      <field name="name">Aged Partner Balance Report</field>
1005
7
      <field name="model">account.aged.trial.balance.webkit</field>
1006
8
      <field name="inherit_id" ref="account.account_common_report_view"/>
1007
9
      <field name="arch" type="xml">
1008
10
        <data>
1009
11
1010
12
          <xpath expr="/form/label[@string='']" position="replace">
1011
13
            <separator string="Aged Partner Balance" colspan="4"/>
1012
14
            <label nolabel="1"
1013
15
                   colspan="4"
1014
16
                   string="This report list partner open balances and indicate when payment is (or was) supposed to be completed"/>
1015
17
          </xpath>
1016
18
          <field name="chart_account_id" position='attributes'>
1017
19
            <attribute name="colspan">4</attribute>
1018
20
          </field>
1019
21
          <xpath expr="//field[@name='target_move']" position="after">
1020
22
            <newline/>
1021
23
            <field name="result_selection" colspan="4"/>
1022
24
          </xpath>
1023
25
          <xpath expr="/form/notebook[1]" position="after">
1024
26
            <separator string="Clearance Analysis Options" colspan="4"/>
1025
27
            <newline/>
1026
28
            <field name="until_date"/>
1027
29
          </xpath>
1028
30
          <page name="filters" position="after">
1029
31
            <page string="Partners Filters" name="partners">
1030
32
              <separator string="Print only" colspan="4"/>
1031
33
              <field name="partner_ids" colspan="4" nolabel="1"/>
1032
34
            </page>
1033
35
          </page>
1034
36
          <page name="filters" position="attributes">
1035
37
            <attribute name="string">Time Filters</attribute>
1036
38
          </page>
1037
39
          <page name="journal_ids" position="attributes">
1038
40
            <attribute name="invisible">True</attribute>
1039
41
          </page>
1040
42
          <field name="fiscalyear_id" position="attributes">
1041
43
            <attribute name="on_change">onchange_fiscalyear(fiscalyear_id, period_to, date_to, until_date)</attribute>
1042
44
          </field>
1043
45
          <field name="date_to" position="attributes">
1044
46
            <attribute name="on_change">onchange_date_to(fiscalyear_id, period_to, date_to, until_date)</attribute>
1045
47
          </field>
1046
48
          <field name="period_to" position="attributes">
1047
49
            <attribute name="on_change">onchange_period_to(fiscalyear_id, period_to, date_to, until_date)</attribute>
1048
50
          </field>
1049
51
          <field name="period_from" position="attributes">
1050
52
            <attribute name="domain">[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]</attribute>
1051
53
          </field>
1052
54
          <field name="period_to" position="attributes">
1053
55
            <attribute name="domain">[('fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]</attribute>
1054
56
          </field>
1055
57
        </data>
1056
58
      </field>
1057
59
    </record>
1058
60
1059
61
    <record id="action_account_aged_trial_balance_menu_webkit"
1060
62
            model="ir.actions.act_window">
1061
63
      <field name="name">Aged partner balance</field>
1062
64
      <field name="type">ir.actions.act_window</field>
1063
65
      <field name="res_model">account.aged.trial.balance.webkit</field>
1064
66
      <field name="view_type">form</field>
1065
67
      <field name="view_mode">form</field>
1066
68
      <field name="view_id" ref="account_aged_trial_balance_webkit"/>
1067
69
      <field name="target">new</field>
1068
70
    </record>
1069
71
  </data>
1070
72
</openerp>
Status:	Merged
Approved by:	Yannick Vaucher @ Camptocamp on 2014-04-15
Approved revision:	102
Merged at revision:	86
Proposed branch:	lp:~camptocamp/account-financial-report/add_aged_partner_ledger-nbi
Merge into:	lp:~account-report-core-editor/account-financial-report/7.0
Diff against target:	1070 lines (+829/-20) 14 files modified account_financial_report_webkit/__openerp__.py (+46/-3) account_financial_report_webkit/report/__init__.py (+1/-0) account_financial_report_webkit/report/aged_partner_balance.py (+403/-0) account_financial_report_webkit/report/common_reports.py (+12/-2) account_financial_report_webkit/report/open_invoices.py (+0/-1) account_financial_report_webkit/report/report.xml (+34/-11) account_financial_report_webkit/report/templates/aged_trial_webkit.mako (+155/-0) account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html (+2/-2) account_financial_report_webkit/report/webkit_parser_header_fix.py (+0/-1) account_financial_report_webkit/report_menus.xml (+4/-0) account_financial_report_webkit/tests/aged_trial_balance.yml (+60/-0) account_financial_report_webkit/wizard/__init__.py (+1/-0) account_financial_report_webkit/wizard/aged_partner_balance_wizard.py (+39/-0) account_financial_report_webkit/wizard/aged_partner_balance_wizard.xml (+72/-0)
To merge this branch:	bzr merge lp:~camptocamp/account-financial-report/add_aged_partner_ledger-nbi
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Stéphane Bidoul (Acsone) (community)	test	2014-03-24	Approve on 2014-04-13
Frederic Clementi - Camptocamp	functional	2014-03-14	Approve on 2014-03-24
Alexandre Fayolle - camptocamp	lgtm		Approve on 2014-03-24
Luc De Meyer (Noviat)		2014-03-24	Pending
Review via email: mp+211040@code.launchpad.net