odoo-addon-account-financial-report 16.0.1.3.4.4__py3-none-any.whl → 16.0.1.3.5__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.

Files changed (8) hide show
  1. odoo/addons/account_financial_report/__manifest__.py +1 -1
  2. odoo/addons/account_financial_report/report/abstract_report_xlsx.py +4 -1
  3. odoo/addons/account_financial_report/report/general_ledger_xlsx.py +12 -4
  4. odoo/addons/account_financial_report/report/templates/general_ledger.xml +16 -8
  5. {odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info → odoo_addon_account_financial_report-16.0.1.3.5.dist-info}/METADATA +1 -1
  6. {odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info → odoo_addon_account_financial_report-16.0.1.3.5.dist-info}/RECORD +8 -8
  7. {odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info → odoo_addon_account_financial_report-16.0.1.3.5.dist-info}/WHEEL +0 -0
  8. {odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info → odoo_addon_account_financial_report-16.0.1.3.5.dist-info}/top_level.txt +0 -0
odoo/addons/account_financial_report/__manifest__.py CHANGED
@@ -6,7 +6,7 @@
6
6
  # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
7
7
  {
8
8
  "name": "Account Financial Reports",
9
- "version": "16.0.1.3.4",
9
+ "version": "16.0.1.3.5",
10
10
  "category": "Reporting",
11
11
  "summary": "OCA Financial Reports",
12
12
  "author": "Camptocamp SA,"
odoo/addons/account_financial_report/report/abstract_report_xlsx.py CHANGED
@@ -531,7 +531,10 @@ class AbstractReportXslx(models.AbstractModel):
531
531
  format_amt = report_data["formats"]["format_amount"]
532
532
  field_prefix = "format_amount"
533
533
  if "currency_id" in line_object and line_object.get("currency_id", False):
534
- currency = line_object["currency_id"]
534
+ if isinstance(line_object["currency_id"], int):
535
+ currency = self.env["res.currency"].browse(line_object["currency_id"])
536
+ else:
537
+ currency = line_object["currency_id"]
535
538
  field_name = "{}_{}".format(field_prefix, currency.name)
536
539
  if hasattr(self, field_name):
537
540
  format_amt = getattr(self, field_name)
odoo/addons/account_financial_report/report/general_ledger_xlsx.py CHANGED
@@ -237,6 +237,15 @@ class GeneralLedgerXslx(models.AbstractModel):
237
237
  # Display array header for move lines
238
238
  self.write_array_header(report_data)
239
239
 
240
+ account.update(
241
+ {
242
+ "currency_id": accounts_data[account["id"]]["currency_id"],
243
+ "currency_name": accounts_data[account["id"]][
244
+ "currency_name"
245
+ ],
246
+ }
247
+ )
248
+
240
249
  # Display initial balance line for partner
241
250
  group_item.update(
242
251
  {
@@ -248,6 +257,9 @@ class GeneralLedgerXslx(models.AbstractModel):
248
257
  if "grouped_by" in account
249
258
  else "",
250
259
  "currency_id": accounts_data[account["id"]]["currency_id"],
260
+ "currency_name": accounts_data[account["id"]][
261
+ "currency_name"
262
+ ],
251
263
  }
252
264
  )
253
265
  if foreign_currency:
@@ -315,8 +327,6 @@ class GeneralLedgerXslx(models.AbstractModel):
315
327
  group_item.update(
316
328
  {
317
329
  "final_bal_curr": group_item["fin_bal"]["bal_curr"],
318
- "currency_name": group_item["currency_id"].name,
319
- "currency_id": group_item["currency_id"].id,
320
330
  }
321
331
  )
322
332
  self.write_ending_balance_from_dict(group_item, report_data)
@@ -336,8 +346,6 @@ class GeneralLedgerXslx(models.AbstractModel):
336
346
  account.update(
337
347
  {
338
348
  "final_bal_curr": account["fin_bal"]["bal_curr"],
339
- "currency_name": account["currency_id"].name,
340
- "currency_id": account["currency_id"].id,
341
349
  }
342
350
  )
343
351
  self.write_ending_balance_from_dict(account, report_data)
odoo/addons/account_financial_report/report/templates/general_ledger.xml CHANGED
@@ -307,6 +307,10 @@
307
307
  </div>
308
308
  <t t-if="foreign_currency">
309
309
  <t t-if="account['currency_id']">
310
+ <t
311
+ t-set="account_currency"
312
+ t-value="currency_model.browse(account['currency_id'])"
313
+ />
310
314
  <div class="act_as_cell amount" style="width: 3.63%;">
311
315
  <t t-if="type == 'account_type'">
312
316
  <span
@@ -315,7 +319,7 @@
315
319
  >
316
320
  <t
317
321
  t-out="account_or_group_item_object['init_bal']['bal_curr']"
318
- t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
322
+ t-options="{'widget': 'monetary', 'display_currency': account_currency}"
319
323
  />
320
324
  </span>
321
325
  </t>
@@ -326,7 +330,7 @@
326
330
  >
327
331
  <t
328
332
  t-out="account_or_group_item_object['init_bal']['bal_curr']"
329
- t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
333
+ t-options="{'widget': 'monetary', 'display_currency': account_currency}"
330
334
  />
331
335
  </span>
332
336
  </t>
@@ -339,7 +343,7 @@
339
343
  >
340
344
  <t
341
345
  t-out="account_or_group_item_object['init_bal']['bal_curr']"
342
- t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
346
+ t-options="{'widget': 'monetary', 'display_currency': account_currency}"
343
347
  />
344
348
  </span>
345
349
  </t>
@@ -350,7 +354,7 @@
350
354
  >
351
355
  <t
352
356
  t-out="account_or_group_item_object['init_bal']['bal_curr']"
353
- t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
357
+ t-options="{'widget': 'monetary', 'display_currency': account_currency}"
354
358
  />
355
359
  </span>
356
360
  </t>
@@ -699,6 +703,10 @@
699
703
  <t t-set="misc_grouped_domain" t-value="[]" t-else="" />
700
704
  <t t-if="foreign_currency">
701
705
  <t t-if="account['currency_id']">
706
+ <t
707
+ t-set="account_currency"
708
+ t-value="currency_model.browse(account['currency_id'])"
709
+ />
702
710
  <div class="act_as_cell amount" style="width: 3.63%;">
703
711
  <t t-if="type == 'account_type'">
704
712
  <span>
@@ -710,7 +718,7 @@
710
718
  >
711
719
  <t
712
720
  t-out="account_or_group_item_object['fin_bal']['bal_curr']"
713
- t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
721
+ t-options="{'widget': 'monetary', 'display_currency': account_currency}"
714
722
  />
715
723
  </a>
716
724
  </span>
@@ -725,7 +733,7 @@
725
733
  >
726
734
  <t
727
735
  t-out="account_or_group_item_object['fin_bal']['bal_curr']"
728
- t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
736
+ t-options="{'widget': 'monetary', 'display_currency': account_currency}"
729
737
  />
730
738
  </a>
731
739
  </span>
@@ -742,7 +750,7 @@
742
750
  >
743
751
  <t
744
752
  t-out="account_or_group_item_object['fin_bal']['bal_curr']"
745
- t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
753
+ t-options="{'widget': 'monetary', 'display_currency': account_currency}"
746
754
  />
747
755
  </a>
748
756
  </span>
@@ -757,7 +765,7 @@
757
765
  >
758
766
  <t
759
767
  t-out="account_or_group_item_object['fin_bal']['bal_curr']"
760
- t-options="{'widget': 'monetary', 'display_currency': account['currency_id']}"
768
+ t-options="{'widget': 'monetary', 'display_currency': account_currency}"
761
769
  />
762
770
  </a>
763
771
  </span>
{odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info → odoo_addon_account_financial_report-16.0.1.3.5.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: odoo-addon-account-financial-report
3
- Version: 16.0.1.3.4.4
3
+ Version: 16.0.1.3.5
4
4
  Summary: OCA Financial Reports
5
5
  Home-page: https://github.com/OCA/account-financial-reporting
6
6
  Author: Camptocamp SA,initOS GmbH,redCOR AG,ForgeFlow,Odoo Community Association (OCA)
{odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info → odoo_addon_account_financial_report-16.0.1.3.5.dist-info}/RECORD RENAMED
@@ -1,6 +1,6 @@
1
1
  odoo/addons/account_financial_report/README.rst,sha256=OUoixTNZD7NlSufdSEggAXXL5e_9a0lUIuFIXci_NqU,5536
2
2
  odoo/addons/account_financial_report/__init__.py,sha256=YoL8hk5QxSifbFJL7gPzpOSk-3zB1OSHJBXyZK25G6Q,187
3
- odoo/addons/account_financial_report/__manifest__.py,sha256=phFJ-uLa3KVuObCIbuw2l5VgWNu7OMC8M-oKJMhJCeE,1926
3
+ odoo/addons/account_financial_report/__manifest__.py,sha256=Eh9N01bFioF9XuucQMuNNa4Wd9echd4Ep7hbB98D6n4,1926
4
4
  odoo/addons/account_financial_report/menuitems.xml,sha256=k20N6cNRlDsnPhc378MVs7jwzJhbbJQ2k-P3WdsmF_M,1206
5
5
  odoo/addons/account_financial_report/reports.xml,sha256=c2KamS250rNzHUInjNwC0G2dhwiIqtYgbked51PtmVw,9254
6
6
  odoo/addons/account_financial_report/i18n/account_financial_report.pot,sha256=Cjh1EiAacCAHkrSNMNGKavN8_DQ6D6wNQID1536mij8,77347
@@ -34,11 +34,11 @@ odoo/addons/account_financial_report/readme/HISTORY.rst,sha256=sgCgHPjX3fXH6T0yS
34
34
  odoo/addons/account_financial_report/readme/ROADMAP.rst,sha256=CK1z_cr3bdtTPHyCOXliTBkAB0rqPL_srPhIkBj-6Xw,362
35
35
  odoo/addons/account_financial_report/report/__init__.py,sha256=D-L2gAu6aAsGo9YtxVH14sulDEPHK0CEy7A2kTwewTE,618
36
36
  odoo/addons/account_financial_report/report/abstract_report.py,sha256=fyg8uk_FCrQPVv-LSXbts2v9aXIcD2WDWwmYBbq7MYA,6028
37
- odoo/addons/account_financial_report/report/abstract_report_xlsx.py,sha256=sDrhRI5Ko_QFaWGLZivCHpAhUSh7q_mTfP3LtxzpBLw,29697
37
+ odoo/addons/account_financial_report/report/abstract_report_xlsx.py,sha256=djyJMJDq-7zI3PM49B_dW-AFCfzJRSCScKk5j4SXI0I,29866
38
38
  odoo/addons/account_financial_report/report/aged_partner_balance.py,sha256=EcsLbWzZY1HEIA0LvezULg0mKC2HzQq9x8y6Unc6A4s,16271
39
39
  odoo/addons/account_financial_report/report/aged_partner_balance_xlsx.py,sha256=pDtYtdoF8UVb0LJrM5cc0zSnwRnKa0O_AUqsSGZRZKk,12312
40
40
  odoo/addons/account_financial_report/report/general_ledger.py,sha256=C_Nk3VfYOlyI00mB5ejoKHpLiJGEJqMnZmDX7NlXEfo,34822
41
- odoo/addons/account_financial_report/report/general_ledger_xlsx.py,sha256=d_dxB9N_xRoDECUY5cyILn-10nA7jmPay9sK3YtFC0Q,16224
41
+ odoo/addons/account_financial_report/report/general_ledger_xlsx.py,sha256=5-hyJbmVOZgCWz1ex13lrBFDaI8COgXWwOyfFG7XM_0,16421
42
42
  odoo/addons/account_financial_report/report/journal_ledger.py,sha256=5_w9CmKy_eZNgJsSL1TFTTe5b3DBBEY1qmseI1RuGPI,15424
43
43
  odoo/addons/account_financial_report/report/journal_ledger_xlsx.py,sha256=Pp7iDkBjSk0BqZkSPAiKI2hBHNcjKYjZoBxuL_ENz5E,10126
44
44
  odoo/addons/account_financial_report/report/open_items.py,sha256=OV1yJNch-l2kUCu7ZVPD4P_zLZBQ-naqm0r6bhe3g70,11914
@@ -48,7 +48,7 @@ odoo/addons/account_financial_report/report/trial_balance_xlsx.py,sha256=phPDqy4
48
48
  odoo/addons/account_financial_report/report/vat_report.py,sha256=H0k2uhDK_X3el1gVXA_lBUoj2dO1u104rjaWBcWLpnk,10131
49
49
  odoo/addons/account_financial_report/report/vat_report_xlsx.py,sha256=aa0dLzYdywjmO63ONRYUBTpSGmsPfEjX60CkUbULuo8,2317
50
50
  odoo/addons/account_financial_report/report/templates/aged_partner_balance.xml,sha256=S-434PFf2m_2Nt_bHNLxwRfw7WZ_6RIFPU90LPWhqvU,34728
51
- odoo/addons/account_financial_report/report/templates/general_ledger.xml,sha256=aE9nlj2jBGAKiEi8xJ2aZ6QrUrQZMHWDEJWi-_LBd3Y,38771
51
+ odoo/addons/account_financial_report/report/templates/general_ledger.xml,sha256=K1XsUg6UzECHHEAxMdcUiLQW82uglOwArtWI4CIPGuI,39105
52
52
  odoo/addons/account_financial_report/report/templates/journal_ledger.xml,sha256=HcM-2KxISeTbH1Xeer_pe__N6jQ90yzq5Zar419MCdU,21493
53
53
  odoo/addons/account_financial_report/report/templates/layouts.xml,sha256=-IK2mtO4D6GqnOWUG_pToTlirdjd4v5r1UxaJuUpSTE,1181
54
54
  odoo/addons/account_financial_report/report/templates/open_items.xml,sha256=k6rrHbDV8UHrfafH0VEDbB4GyBBn25YAh2p1e1io6gw,14813
@@ -89,7 +89,7 @@ odoo/addons/account_financial_report/wizard/trial_balance_wizard.py,sha256=8Fjyw
89
89
  odoo/addons/account_financial_report/wizard/trial_balance_wizard_view.xml,sha256=7oNGPs3s8DVw3movVGe2ryRUNl1MtN7O76UH8zaFFtI,7048
90
90
  odoo/addons/account_financial_report/wizard/vat_report_wizard.py,sha256=pJATDNWLcEWvctby5e5yvv4Kz7YDfCTi7YZP7slA8a4,3424
91
91
  odoo/addons/account_financial_report/wizard/vat_report_wizard_view.xml,sha256=T3P81O4csDGP7Jmf7eAtmbIIldja3IoXbBmweMMt8vA,2330
92
- odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info/METADATA,sha256=jhNCVxmA4ioRYfuDu_KsaV0toTQeLbjbWkPVnsW7C38,6247
93
- odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
94
- odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
95
- odoo_addon_account_financial_report-16.0.1.3.4.4.dist-info/RECORD,,
92
+ odoo_addon_account_financial_report-16.0.1.3.5.dist-info/METADATA,sha256=KGqnOr-KVUwVLEOkOq9C2rqZraRM185ZVe6EJV4WKc4,6245
93
+ odoo_addon_account_financial_report-16.0.1.3.5.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
94
+ odoo_addon_account_financial_report-16.0.1.3.5.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
95
+ odoo_addon_account_financial_report-16.0.1.3.5.dist-info/RECORD,,