Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][IMP] l10n_au: tax report headings #83334

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jan 25, 2022

  • Provide consistent formatting of totals - amounts owed to the ATO and
    amounts owed by the ATO are now formatted the same.

  • Also, the titles are NOT subtotals of the rows below, leading to
    misleading sales / purchase totals (which are not transferred to
    BAS in any case).

Description of the issue/feature this PR addresses:

Inconsistent formatting of BAS Tax Report Headings / Totals

Current behavior before PR:

Headings had meaningless unreportable subtotal figures
Total lines were formatted inconsistently

Desired behavior after PR is merged:

Remove unneeded figures and standardise 2 subtotals

--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #83267
Forward-Port-Of: #79138

@robodoo
Copy link
Contributor

robodoo commented Jan 25, 2022

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 25, 2022

Ping @richard-willdooit, @william-andre cherrypicking of pull request #79138 failed.

stderr:

13:39:51.522382 git.c:344               trace: built-in: git cherry-pick b524e1e24ec89c20d1fe9dc1f610ae523039418e
error: could not apply b524e1e24ec... [IMP] l10n_au: tax report headings
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

@robodoo robodoo added conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot labels Jan 25, 2022
@C3POdoo C3POdoo added the RD research & development, internal work label Jan 25, 2022
@richard-willdooit
Copy link
Contributor

@william-andre I'm pretty sure I'm not in a position to do something here?

@william-andre
Copy link
Contributor

@william-andre I'm pretty sure I'm not in a position to do something here?

No, I will write a script to do the forward port automatically

- Remove "subtotal" amounts from headings.
- Pull GST only and G20 in under purchasing header.
- Remove tag from comparison heading, as it should have no links to audit.
- Add summary section, to make G9 and G20 transfer to 1A / 1B as per ATO
suggested formatting, and to make those figures easier to find on the
report.

X-original-commit: f3224a2
@william-andre william-andre force-pushed the saas-15.1-13.0-l10n_au-tax-headings-vz9h-fw branch from ecb93bf to 7ff2849 Compare January 25, 2022 18:54
@william-andre
Copy link
Contributor

3 hours to write a simple script...

https://gist.github.com/william-andre/5e4179d078b7ed0a48044ee8e0e8c777

@robodoo r+

@C3POdoo C3POdoo requested review from a team and lordkrandel and removed request for a team January 25, 2022 18:59
robodoo pushed a commit that referenced this pull request Jan 25, 2022
- Remove "subtotal" amounts from headings.
- Pull GST only and G20 in under purchasing header.
- Remove tag from comparison heading, as it should have no links to audit.
- Add summary section, to make G9 and G20 transfer to 1A / 1B as per ATO
suggested formatting, and to make those figures easier to find on the
report.

closes #83334

X-original-commit: f3224a2
Signed-off-by: William André (wan) <wan@odoo.com>
@robodoo robodoo closed this Jan 25, 2022
@robodoo robodoo temporarily deployed to merge January 25, 2022 20:26 Inactive
@fw-bot fw-bot deleted the saas-15.1-13.0-l10n_au-tax-headings-vz9h-fw branch February 8, 2022 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants