odoo-addon-account-financial-report 16.0.1.15.2.2__py3-none-any.whl → 16.0.1.16.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of odoo-addon-account-financial-report might be problematic. Click here for more details.
- odoo/addons/account_financial_report/README.rst +14 -1
- odoo/addons/account_financial_report/__manifest__.py +5 -1
- odoo/addons/account_financial_report/data/report_column_data.xml +358 -0
- odoo/addons/account_financial_report/i18n/account_financial_report.pot +125 -0
- odoo/addons/account_financial_report/models/__init__.py +1 -0
- odoo/addons/account_financial_report/models/account_financial_report_column.py +17 -0
- odoo/addons/account_financial_report/readme/CONTRIBUTORS.rst +1 -0
- odoo/addons/account_financial_report/readme/DESCRIPTION.rst +3 -0
- odoo/addons/account_financial_report/readme/HISTORY.rst +5 -0
- odoo/addons/account_financial_report/readme/ROADMAP.rst +3 -0
- odoo/addons/account_financial_report/report/abstract_report.py +15 -0
- odoo/addons/account_financial_report/report/aged_partner_balance.py +18 -12
- odoo/addons/account_financial_report/report/general_ledger.py +27 -24
- odoo/addons/account_financial_report/report/journal_ledger.py +27 -22
- odoo/addons/account_financial_report/report/open_items.py +24 -19
- odoo/addons/account_financial_report/report/templates/general_ledger.xml +116 -52
- odoo/addons/account_financial_report/report/templates/journal_ledger.xml +79 -31
- odoo/addons/account_financial_report/report/templates/open_items.xml +51 -22
- odoo/addons/account_financial_report/report/trial_balance.py +30 -26
- odoo/addons/account_financial_report/report/vat_report.py +21 -16
- odoo/addons/account_financial_report/security/ir.model.access.csv +1 -0
- odoo/addons/account_financial_report/static/description/index.html +33 -19
- odoo/addons/account_financial_report/tests/test_aged_partner_balance.py +4 -4
- odoo/addons/account_financial_report/tests/test_general_ledger.py +1 -1
- odoo/addons/account_financial_report/tests/test_journal_ledger.py +5 -5
- odoo/addons/account_financial_report/tests/test_open_items.py +1 -1
- odoo/addons/account_financial_report/tests/test_trial_balance.py +4 -4
- odoo/addons/account_financial_report/tests/test_vat_report.py +1 -1
- odoo/addons/account_financial_report/view/account_financial_report_column_view.xml +46 -0
- odoo/addons/account_financial_report/wizard/abstract_wizard.py +25 -1
- odoo/addons/account_financial_report/wizard/aged_partner_balance_wizard.py +17 -15
- odoo/addons/account_financial_report/wizard/general_ledger_wizard.py +26 -23
- odoo/addons/account_financial_report/wizard/general_ledger_wizard_view.xml +7 -0
- odoo/addons/account_financial_report/wizard/journal_ledger_wizard.py +19 -17
- odoo/addons/account_financial_report/wizard/journal_ledger_wizard_view.xml +48 -32
- odoo/addons/account_financial_report/wizard/open_items_wizard.py +20 -18
- odoo/addons/account_financial_report/wizard/open_items_wizard_view.xml +67 -54
- odoo/addons/account_financial_report/wizard/trial_balance_wizard.py +26 -24
- odoo/addons/account_financial_report/wizard/vat_report_wizard.py +15 -13
- {odoo_addon_account_financial_report-16.0.1.15.2.2.dist-info → odoo_addon_account_financial_report-16.0.1.16.0.dist-info}/METADATA +16 -3
- {odoo_addon_account_financial_report-16.0.1.15.2.2.dist-info → odoo_addon_account_financial_report-16.0.1.16.0.dist-info}/RECORD +43 -40
- {odoo_addon_account_financial_report-16.0.1.15.2.2.dist-info → odoo_addon_account_financial_report-16.0.1.16.0.dist-info}/WHEEL +0 -0
- {odoo_addon_account_financial_report-16.0.1.15.2.2.dist-info → odoo_addon_account_financial_report-16.0.1.16.0.dist-info}/top_level.txt +0 -0
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
</t>
|
|
120
120
|
<div class="act_as_thead">
|
|
121
121
|
<div class="act_as_row labels">
|
|
122
|
-
<t t-if="with_auto_sequence">
|
|
122
|
+
<t t-if="with_auto_sequence and sequence_visible">
|
|
123
123
|
<div
|
|
124
124
|
class="act_as_cell first_column"
|
|
125
125
|
name="entry"
|
|
@@ -129,6 +129,7 @@
|
|
|
129
129
|
</div>
|
|
130
130
|
</t>
|
|
131
131
|
<div
|
|
132
|
+
t-if="entry_visible"
|
|
132
133
|
t-att-class="'act_as_cell' if with_auto_sequence else 'act_as_cell first_column'"
|
|
133
134
|
class="act_as_cell"
|
|
134
135
|
name="entry"
|
|
@@ -136,26 +137,57 @@
|
|
|
136
137
|
>
|
|
137
138
|
Entry
|
|
138
139
|
</div>
|
|
139
|
-
<div class="act_as_cell" name="date" style="width: 5.41%;">Date</div>
|
|
140
140
|
<div
|
|
141
|
+
t-if="date_visible"
|
|
142
|
+
class="act_as_cell"
|
|
143
|
+
name="date"
|
|
144
|
+
style="width: 5.41%;"
|
|
145
|
+
>Date</div>
|
|
146
|
+
<div
|
|
147
|
+
t-if="account_code_visible or account_name_visible"
|
|
141
148
|
class="act_as_cell"
|
|
142
149
|
name="account"
|
|
143
150
|
t-att-style="account_column_style"
|
|
144
151
|
>
|
|
145
152
|
Account
|
|
146
153
|
</div>
|
|
147
|
-
<div
|
|
154
|
+
<div
|
|
155
|
+
t-if="partner_visible"
|
|
156
|
+
class="act_as_cell"
|
|
157
|
+
name="partner"
|
|
158
|
+
style="width: 15.14%;"
|
|
159
|
+
>
|
|
148
160
|
Partner
|
|
149
161
|
</div>
|
|
150
|
-
<div
|
|
162
|
+
<div
|
|
163
|
+
t-if="label_visible"
|
|
164
|
+
class="act_as_cell"
|
|
165
|
+
name="label"
|
|
166
|
+
t-att-style="label_column_style"
|
|
167
|
+
>
|
|
151
168
|
Ref - Label
|
|
152
169
|
</div>
|
|
153
|
-
<div
|
|
154
|
-
|
|
155
|
-
|
|
170
|
+
<div
|
|
171
|
+
t-if="taxes_visible"
|
|
172
|
+
class="act_as_cell"
|
|
173
|
+
name="taxes"
|
|
174
|
+
style="width: 7.57%;"
|
|
175
|
+
>Taxes</div>
|
|
176
|
+
<div
|
|
177
|
+
t-if="debit_visible"
|
|
178
|
+
class="act_as_cell"
|
|
179
|
+
name="debit"
|
|
180
|
+
style="width: 8.65%;"
|
|
181
|
+
>Debit</div>
|
|
182
|
+
<div
|
|
183
|
+
t-if="credit_visible"
|
|
184
|
+
class="act_as_cell"
|
|
185
|
+
name="credit"
|
|
186
|
+
style="width: 8.65%;"
|
|
187
|
+
>
|
|
156
188
|
Credit
|
|
157
189
|
</div>
|
|
158
|
-
<t t-if="display_currency">
|
|
190
|
+
<t t-if="display_currency and foreing_currency_visible">
|
|
159
191
|
<div class="act_as_cell" name="currency_name" style="width: 2.16%;">
|
|
160
192
|
Cur.
|
|
161
193
|
</div>
|
|
@@ -172,16 +204,20 @@
|
|
|
172
204
|
</template>
|
|
173
205
|
<template id="account_financial_report.report_journal_ledger_journal_first_line">
|
|
174
206
|
<div class="act_as_row lines">
|
|
175
|
-
<t t-if="with_auto_sequence">
|
|
207
|
+
<t t-if="with_auto_sequence and sequence_visible">
|
|
176
208
|
<div class="act_as_cell" name="Sequence" />
|
|
177
209
|
</t>
|
|
178
|
-
<div class="act_as_cell" name="entry" />
|
|
179
|
-
<div class="act_as_cell" name="date" />
|
|
180
|
-
<div
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
210
|
+
<div t-if="entry_visible" class="act_as_cell" name="entry" />
|
|
211
|
+
<div t-if="date_visible" class="act_as_cell" name="date" />
|
|
212
|
+
<div
|
|
213
|
+
t-if="account_code_visible or account_name_visible"
|
|
214
|
+
class="act_as_cell"
|
|
215
|
+
name="account"
|
|
216
|
+
/>
|
|
217
|
+
<div t-if="partner_visible" class="act_as_cell" name="partner" />
|
|
218
|
+
<div t-if="label_visible" class="act_as_cell" name="label" />
|
|
219
|
+
<div t-if="taxes_visible" class="act_as_cell" name="taxes" />
|
|
220
|
+
<div t-if="debit_visible" class="act_as_cell amount" name="debit">
|
|
185
221
|
<b>
|
|
186
222
|
<span
|
|
187
223
|
t-esc="journal['debit']"
|
|
@@ -189,7 +225,7 @@
|
|
|
189
225
|
/>
|
|
190
226
|
</b>
|
|
191
227
|
</div>
|
|
192
|
-
<div class="act_as_cell amount" name="credit">
|
|
228
|
+
<div t-if="credit_visible" class="act_as_cell amount" name="credit">
|
|
193
229
|
<b>
|
|
194
230
|
<span
|
|
195
231
|
t-esc="journal['credit']"
|
|
@@ -197,7 +233,7 @@
|
|
|
197
233
|
/>
|
|
198
234
|
</b>
|
|
199
235
|
</div>
|
|
200
|
-
<t t-if="display_currency">
|
|
236
|
+
<t t-if="display_currency and foreign_currency_visible">
|
|
201
237
|
<div class="act_as_cell" name="currency_name">
|
|
202
238
|
|
|
203
239
|
</div>
|
|
@@ -226,10 +262,14 @@
|
|
|
226
262
|
</t>
|
|
227
263
|
</template>
|
|
228
264
|
<template id="account_financial_report.report_journal_move_line">
|
|
229
|
-
<div
|
|
265
|
+
<div
|
|
266
|
+
class="act_as_cell left"
|
|
267
|
+
name="auto_sequence"
|
|
268
|
+
t-if="with_auto_sequence and sequence_visible"
|
|
269
|
+
>
|
|
230
270
|
<span t-if="display_move_info" t-esc="move_line['auto_sequence']" />
|
|
231
271
|
</div>
|
|
232
|
-
<div class="act_as_cell left" name="entry">
|
|
272
|
+
<div t-if="entry_visible" class="act_as_cell left" name="entry">
|
|
233
273
|
<t t-if="display_move_info">
|
|
234
274
|
<span
|
|
235
275
|
t-att-res-id="move_line['move_id']"
|
|
@@ -242,35 +282,43 @@
|
|
|
242
282
|
</span>
|
|
243
283
|
</t>
|
|
244
284
|
</div>
|
|
245
|
-
<div class="act_as_cell left" name="date">
|
|
285
|
+
<div t-if="date_visible" class="act_as_cell left" name="date">
|
|
246
286
|
<span
|
|
247
287
|
t-if="display_move_info"
|
|
248
288
|
t-esc="move_line['date']"
|
|
249
289
|
t-options="{'widget': 'date'}"
|
|
250
290
|
/>
|
|
251
291
|
</div>
|
|
252
|
-
<div
|
|
292
|
+
<div
|
|
293
|
+
t-if="account_code_visible or account_name_visible"
|
|
294
|
+
class="act_as_cell left"
|
|
295
|
+
name="account"
|
|
296
|
+
>
|
|
253
297
|
<span
|
|
298
|
+
t-if="account_code_visible"
|
|
254
299
|
t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'code')"
|
|
255
300
|
/>
|
|
256
|
-
<span t-if="display_account_name">
|
|
301
|
+
<span t-if="display_account_name and account_name_visible">
|
|
257
302
|
-
|
|
258
303
|
<span
|
|
259
|
-
t-esc="o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name')"
|
|
304
|
+
t-esc="limit_text(o._get_atr_from_dict(move_line['account_id'], account_ids_data, 'name'), account_name_limit)"
|
|
260
305
|
/>
|
|
261
306
|
</span>
|
|
262
307
|
</div>
|
|
263
|
-
<div class="act_as_cell left" name="partner">
|
|
308
|
+
<div t-if="partner_visible" class="act_as_cell left" name="partner">
|
|
264
309
|
<span
|
|
265
310
|
t-if="display_partner"
|
|
266
311
|
t-esc="o._get_partner_name(move_line['partner_id'], partner_ids_data)"
|
|
267
312
|
/>
|
|
268
313
|
</div>
|
|
269
|
-
<div class="act_as_cell left" name="label">
|
|
270
|
-
<span
|
|
314
|
+
<div t-if="label_visible" class="act_as_cell left" name="label">
|
|
315
|
+
<span
|
|
316
|
+
t-if="move_line['label']"
|
|
317
|
+
t-esc="limit_text(move_line['label'], label_limit)"
|
|
318
|
+
/>
|
|
271
319
|
<span t-if="not move_line['label']">/</span>
|
|
272
320
|
</div>
|
|
273
|
-
<div class="act_as_cell left" name="taxes">
|
|
321
|
+
<div t-if="taxes_visible" class="act_as_cell left" name="taxes">
|
|
274
322
|
<t
|
|
275
323
|
t-set="tax_line_dat"
|
|
276
324
|
t-value="o._get_data_from_dict(move_line['tax_line_id'], tax_line_data)"
|
|
@@ -283,7 +331,7 @@
|
|
|
283
331
|
t-esc="o._get_ml_tax_description(move_line, tax_line_dat, move_line_ids_taxes_dat)"
|
|
284
332
|
/>
|
|
285
333
|
</div>
|
|
286
|
-
<div class="act_as_cell amount" name="debit">
|
|
334
|
+
<div t-if="debit_visible" class="act_as_cell amount" name="debit">
|
|
287
335
|
<t t-if="move_line['debit']">
|
|
288
336
|
<span
|
|
289
337
|
t-esc="move_line['debit']"
|
|
@@ -291,7 +339,7 @@
|
|
|
291
339
|
/>
|
|
292
340
|
</t>
|
|
293
341
|
</div>
|
|
294
|
-
<div class="act_as_cell amount" name="credit">
|
|
342
|
+
<div t-if="credit_visible" class="act_as_cell amount" name="credit">
|
|
295
343
|
<t t-if="move_line['credit']">
|
|
296
344
|
<span
|
|
297
345
|
t-esc="move_line['credit']"
|
|
@@ -299,7 +347,7 @@
|
|
|
299
347
|
/>
|
|
300
348
|
</t>
|
|
301
349
|
</div>
|
|
302
|
-
<t t-if="display_currency">
|
|
350
|
+
<t t-if="display_currency and foreign_currency_visible">
|
|
303
351
|
<div class="act_as_cell" name="currency_name">
|
|
304
352
|
<t t-if="move_line['currency_id']">
|
|
305
353
|
<span
|
|
@@ -238,30 +238,59 @@
|
|
|
238
238
|
<div class="act_as_thead">
|
|
239
239
|
<div class="act_as_row labels">
|
|
240
240
|
<!--## date-->
|
|
241
|
-
<div
|
|
241
|
+
<div
|
|
242
|
+
t-if="date_visible"
|
|
243
|
+
class="act_as_cell first_column"
|
|
244
|
+
style="width: 5.51%;"
|
|
245
|
+
>Date</div>
|
|
242
246
|
<!--## move-->
|
|
243
|
-
<div
|
|
247
|
+
<div
|
|
248
|
+
t-if="entry_visible"
|
|
249
|
+
class="act_as_cell"
|
|
250
|
+
style="width: 9.76%;"
|
|
251
|
+
>Entry</div>
|
|
244
252
|
<!--## journal-->
|
|
245
|
-
<div
|
|
253
|
+
<div
|
|
254
|
+
t-if="journal_visible"
|
|
255
|
+
class="act_as_cell"
|
|
256
|
+
style="width: 4.78%;"
|
|
257
|
+
>Journal</div>
|
|
246
258
|
<!--## account code-->
|
|
247
|
-
<div
|
|
259
|
+
<div
|
|
260
|
+
t-if="account_code_visible"
|
|
261
|
+
class="act_as_cell"
|
|
262
|
+
style="width: 5.38%;"
|
|
263
|
+
>Account</div>
|
|
264
|
+
|
|
248
265
|
<!--## partner-->
|
|
249
|
-
<div
|
|
266
|
+
<div
|
|
267
|
+
t-if="partner_visible"
|
|
268
|
+
class="act_as_cell"
|
|
269
|
+
style="width: 15.07%;"
|
|
270
|
+
>Partner</div>
|
|
250
271
|
<!--## ref - label-->
|
|
251
|
-
<div class="act_as_cell" style="width: 24.5%;">
|
|
272
|
+
<div t-if="ref_label_visible" class="act_as_cell" style="width: 24.5%;">
|
|
252
273
|
Ref -
|
|
253
274
|
Label
|
|
254
275
|
</div>
|
|
255
276
|
<!--## date_due-->
|
|
256
|
-
<div class="act_as_cell" style="width: 6.47%;">
|
|
277
|
+
<div t-if="date_due_visible" class="act_as_cell" style="width: 6.47%;">
|
|
257
278
|
Due
|
|
258
279
|
date
|
|
259
280
|
</div>
|
|
260
281
|
<!--## amount_total_due-->
|
|
261
|
-
<div
|
|
282
|
+
<div
|
|
283
|
+
t-if="original_visible"
|
|
284
|
+
class="act_as_cell"
|
|
285
|
+
style="width: 6.57%;"
|
|
286
|
+
>Original</div>
|
|
262
287
|
<!--## amount_residual-->
|
|
263
|
-
<div
|
|
264
|
-
|
|
288
|
+
<div
|
|
289
|
+
t-if="residual_visible"
|
|
290
|
+
class="act_as_cell"
|
|
291
|
+
style="width: 6.57%;"
|
|
292
|
+
>Residual</div>
|
|
293
|
+
<t t-if="foreign_currency and foreign_currency_visible">
|
|
265
294
|
<!--## currency_name-->
|
|
266
295
|
<div class="act_as_cell" style="width: 2.25%;">Cur.</div>
|
|
267
296
|
<!--## amount_total_due_currency-->
|
|
@@ -280,11 +309,11 @@
|
|
|
280
309
|
<!-- # lines or centralized lines -->
|
|
281
310
|
<div class="act_as_row lines">
|
|
282
311
|
<!--## date-->
|
|
283
|
-
<div class="act_as_cell left">
|
|
312
|
+
<div t-if="date_visible" class="act_as_cell left">
|
|
284
313
|
<span t-out="line['date'].strftime('%d/%m/%Y')" />
|
|
285
314
|
</div>
|
|
286
315
|
<!--## move-->
|
|
287
|
-
<div class="act_as_cell left">
|
|
316
|
+
<div t-if="entry_visible" class="act_as_cell left">
|
|
288
317
|
<span
|
|
289
318
|
t-att-res-id="line['entry_id']"
|
|
290
319
|
res-model="account.move"
|
|
@@ -294,7 +323,7 @@
|
|
|
294
323
|
</span>
|
|
295
324
|
</div>
|
|
296
325
|
<!--## journal-->
|
|
297
|
-
<div class="act_as_cell left">
|
|
326
|
+
<div t-if="journal_visible" class="act_as_cell left">
|
|
298
327
|
<span
|
|
299
328
|
t-att-res-id="journals_data[line['journal_id']]['id']"
|
|
300
329
|
res-model="account.journal"
|
|
@@ -304,7 +333,7 @@
|
|
|
304
333
|
</span>
|
|
305
334
|
</div>
|
|
306
335
|
<!--## account code-->
|
|
307
|
-
<div class="act_as_cell left">
|
|
336
|
+
<div t-if="account_code_visible" class="act_as_cell left">
|
|
308
337
|
<span
|
|
309
338
|
t-att-res-id="accounts_data[account_id]['id']"
|
|
310
339
|
res-model="account.account"
|
|
@@ -314,7 +343,7 @@
|
|
|
314
343
|
</span>
|
|
315
344
|
</div>
|
|
316
345
|
<!--## partner-->
|
|
317
|
-
<div class="act_as_cell left">
|
|
346
|
+
<div t-if="partner_visible" class="act_as_cell left">
|
|
318
347
|
<span
|
|
319
348
|
t-if="line.get('partner_id', False)"
|
|
320
349
|
t-att-res-id="line['partner_id']"
|
|
@@ -325,15 +354,15 @@
|
|
|
325
354
|
</span>
|
|
326
355
|
</div>
|
|
327
356
|
<!--## ref - label-->
|
|
328
|
-
<div class="act_as_cell left">
|
|
329
|
-
<span t-esc="line['ref_label']" />
|
|
357
|
+
<div t-if="ref_label_visible" class="act_as_cell left">
|
|
358
|
+
<span t-esc="limit_text(line['ref_label'], ref_label_limit)" />
|
|
330
359
|
</div>
|
|
331
360
|
<!--## date_due-->
|
|
332
|
-
<div class="act_as_cell left">
|
|
361
|
+
<div t-if="date_due_visible" class="act_as_cell left">
|
|
333
362
|
<span t-esc="line['date_maturity']" />
|
|
334
363
|
</div>
|
|
335
364
|
<!--## amount_total_due-->
|
|
336
|
-
<div class="act_as_cell amount">
|
|
365
|
+
<div t-if="original_visible" class="act_as_cell amount">
|
|
337
366
|
<span
|
|
338
367
|
t-if="line.get('original', False)"
|
|
339
368
|
t-esc="line['original']"
|
|
@@ -341,13 +370,13 @@
|
|
|
341
370
|
/>
|
|
342
371
|
</div>
|
|
343
372
|
<!--## amount_residual-->
|
|
344
|
-
<div class="act_as_cell amount">
|
|
373
|
+
<div t-if="residual_visible" class="act_as_cell amount">
|
|
345
374
|
<span
|
|
346
375
|
t-esc="line['amount_residual']"
|
|
347
376
|
t-options="{'widget': 'monetary', 'display_currency': res_company.currency_id}"
|
|
348
377
|
/>
|
|
349
378
|
</div>
|
|
350
|
-
<t t-if="foreign_currency">
|
|
379
|
+
<t t-if="foreign_currency and foreign_currency_visible">
|
|
351
380
|
<t t-if="line['currency_id']">
|
|
352
381
|
<!--## currency_name-->
|
|
353
382
|
<div class="act_as_cell amount">
|
|
@@ -441,7 +470,7 @@
|
|
|
441
470
|
</t>
|
|
442
471
|
</div>
|
|
443
472
|
<!--## amount_total_due_currency + amount_residual_currency -->
|
|
444
|
-
<t t-if="foreign_currency">
|
|
473
|
+
<t t-if="foreign_currency and foreign_currency_visible">
|
|
445
474
|
<!--## currency_name-->
|
|
446
475
|
<div class="act_as_cell" />
|
|
447
476
|
<!--## amount_total_due_currency-->
|
|
@@ -861,6 +861,7 @@ class TrialBalanceReport(models.AbstractModel):
|
|
|
861
861
|
return groups_data
|
|
862
862
|
|
|
863
863
|
def _get_report_values(self, docids, data):
|
|
864
|
+
res = super()._get_report_values(docids, data)
|
|
864
865
|
show_partner_details = data["show_partner_details"]
|
|
865
866
|
wizard_id = data["wizard_id"]
|
|
866
867
|
company = self.env["res.company"].browse(data["company_id"])
|
|
@@ -955,29 +956,32 @@ class TrialBalanceReport(models.AbstractModel):
|
|
|
955
956
|
total_amount[account_id]["currency_name"] = accounts_data[
|
|
956
957
|
account_id
|
|
957
958
|
]["currency_name"]
|
|
958
|
-
|
|
959
|
-
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
963
|
-
|
|
964
|
-
|
|
965
|
-
|
|
966
|
-
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
971
|
-
|
|
972
|
-
|
|
973
|
-
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
|
|
959
|
+
res.update(
|
|
960
|
+
{
|
|
961
|
+
"doc_ids": [wizard_id],
|
|
962
|
+
"doc_model": "trial.balance.report.wizard",
|
|
963
|
+
"docs": self.env["trial.balance.report.wizard"].browse(wizard_id),
|
|
964
|
+
"foreign_currency": data["foreign_currency"],
|
|
965
|
+
"company_name": company.display_name,
|
|
966
|
+
"company_currency": company.currency_id,
|
|
967
|
+
"currency_name": company.currency_id.name,
|
|
968
|
+
"date_from": data["date_from"],
|
|
969
|
+
"date_to": data["date_to"],
|
|
970
|
+
"only_posted_moves": data["only_posted_moves"],
|
|
971
|
+
"hide_account_at_0": data["hide_account_at_0"],
|
|
972
|
+
"show_partner_details": data["show_partner_details"],
|
|
973
|
+
"limit_hierarchy_level": data["limit_hierarchy_level"],
|
|
974
|
+
"show_hierarchy": show_hierarchy,
|
|
975
|
+
"hide_parent_hierarchy_level": data["hide_parent_hierarchy_level"],
|
|
976
|
+
"trial_balance": trial_balance,
|
|
977
|
+
"trial_balance_grouped": trial_balance_grouped,
|
|
978
|
+
"total_amount": total_amount,
|
|
979
|
+
"total_amount_grouped": total_amount_grouped,
|
|
980
|
+
"accounts_data": accounts_data,
|
|
981
|
+
"partners_data": partners_data,
|
|
982
|
+
"show_hierarchy_level": show_hierarchy_level,
|
|
983
|
+
"currency_model": self.env["res.currency"],
|
|
984
|
+
"grouped_by": grouped_by,
|
|
985
|
+
}
|
|
986
|
+
)
|
|
987
|
+
return res
|
|
@@ -8,6 +8,7 @@ from odoo import api, fields, models
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
class VATReport(models.AbstractModel):
|
|
11
|
+
_inherit = "report.account_financial_report.abstract_report"
|
|
11
12
|
_name = "report.account_financial_report.vat_report"
|
|
12
13
|
_description = "Vat Report Report"
|
|
13
14
|
|
|
@@ -197,6 +198,7 @@ class VATReport(models.AbstractModel):
|
|
|
197
198
|
return vat_report_list
|
|
198
199
|
|
|
199
200
|
def _get_report_values(self, docids, data):
|
|
201
|
+
res = super()._get_report_values(docids, data)
|
|
200
202
|
wizard_id = data["wizard_id"]
|
|
201
203
|
company = self.env["res.company"].browse(data["company_id"])
|
|
202
204
|
company_id = data["company_id"]
|
|
@@ -216,22 +218,25 @@ class VATReport(models.AbstractModel):
|
|
|
216
218
|
vat_report = self._get_vat_report_tag_data(
|
|
217
219
|
vat_report_data, tax_data, tax_detail
|
|
218
220
|
)
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
221
|
+
res.update(
|
|
222
|
+
{
|
|
223
|
+
"doc_ids": [wizard_id],
|
|
224
|
+
"doc_model": "vat.report.wizard",
|
|
225
|
+
"docs": self.env["vat.report.wizard"].browse(wizard_id),
|
|
226
|
+
"company_name": company.display_name,
|
|
227
|
+
"currency_name": company.currency_id.name,
|
|
228
|
+
"date_from": date_from,
|
|
229
|
+
"date_to": date_to,
|
|
230
|
+
"based_on": dict(
|
|
231
|
+
self.env["vat.report.wizard"]
|
|
232
|
+
._fields["based_on"]
|
|
233
|
+
._description_selection(self.env)
|
|
234
|
+
).get(data["based_on"]),
|
|
235
|
+
"tax_detail": data["tax_detail"],
|
|
236
|
+
"vat_report": vat_report,
|
|
237
|
+
}
|
|
238
|
+
)
|
|
239
|
+
return res
|
|
235
240
|
|
|
236
241
|
def _get_ml_fields_vat_report(self):
|
|
237
242
|
return [
|
|
@@ -7,3 +7,4 @@ access_trial_balance_report_wizard,access_trial_balance_report_wizard,model_tria
|
|
|
7
7
|
access_vat_report_wizard,access_vat_report_wizard,model_vat_report_wizard,base.group_user,1,1,1,1
|
|
8
8
|
access_account_age_report_configuration,access_account_age_report_configuration,model_account_age_report_configuration,base.group_user,1,1,1,1
|
|
9
9
|
access_account_age_report_configuration_line,access_account_age_report_configuration_line,model_account_age_report_configuration_line,base.group_user,1,1,1,1
|
|
10
|
+
account_financial_report.access_account_financial_report_column,access_account_financial_report_column,account_financial_report.model_account_financial_report_column,base.group_user,1,1,1,1
|