diff --git a/account_move_obc_csv/README.rst b/account_move_obc_csv/README.rst index 6b9c96c3..9cf9f619 100644 --- a/account_move_obc_csv/README.rst +++ b/account_move_obc_csv/README.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ==================== Account Move OBC CSV ==================== @@ -13,7 +17,7 @@ Account Move OBC CSV .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png +.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-qrtl%2Faxls--custom-lightgray.png?logo=github diff --git a/account_move_obc_csv/report/report_account_move_obc_csv.py b/account_move_obc_csv/report/report_account_move_obc_csv.py index 6123ca88..b3da8cd9 100644 --- a/account_move_obc_csv/report/report_account_move_obc_csv.py +++ b/account_move_obc_csv/report/report_account_move_obc_csv.py @@ -109,10 +109,11 @@ def _get_account_for_export(self, line): def _get_line_analytic_account(self, line, plan_type, is_substituted): """Return the analytic account for the given plan type from the line. - When account substitution has been applied (e.g. GRNI -> stock valuation), - the analytic accounts should not be filled from analytic lines. + Even when the account code is substituted for OBC export (e.g. GRNI -> + stock valuation), the bill line's department should still be used. + Project should remain blank in that case. """ - if is_substituted: + if is_substituted and plan_type == "project": return self.env["account.analytic.account"] return line.analytic_line_ids.filtered( lambda x: x.plan_type == plan_type diff --git a/account_move_obc_csv/static/description/index.html b/account_move_obc_csv/static/description/index.html index 72b8c982..132dcc72 100644 --- a/account_move_obc_csv/static/description/index.html +++ b/account_move_obc_csv/static/description/index.html @@ -3,7 +3,7 @@ -Account Move OBC CSV +README.rst -
-

Account Move OBC CSV

+
+ +Odoo Community Association +
+

Account Move OBC CSV

-

Beta License: AGPL-3 qrtl/axls-custom

+

Beta License: AGPL-3 qrtl/axls-custom

This module does the following:

  • Let users export journal entries in CSV format to be uploaded to OBC @@ -389,7 +392,7 @@

    Account Move OBC CSV

-

Configuration

+

Configuration

Following settings should be updated:

  • Set Plan Type in relevant analytic plans. Plan Type decides which @@ -400,12 +403,12 @@

    Configuration

-

Usage

+

Usage

Select journal entries that should be exported, and then go to Print > OBC CSV to export the data.

-

Bug Tracker

+

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed @@ -413,19 +416,20 @@

Bug Tracker

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

  • Quartile Limited
-

Maintainers

+

Maintainers

This module is part of the qrtl/axls-custom project on GitHub.

You are welcome to contribute.

+