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.

Sign up for GitHub

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

Jump to bottom

[12.0][MIG] sale_layout_category_hide_detail #70

Merged
merged 4 commits into from
Aug 13, 2019
Merged

[12.0][MIG] sale_layout_category_hide_detail #70

merged 4 commits into from
Aug 13, 2019

Conversation

ernestotejeda
Copy link
Member

Main changes:

  • Add JS (Add widget boolean_fa_icon, Add show_in_line_section option on fields statements in list views)
  • Adapt reports inheritance
  • Inherit Sale order form vew and Invoice form view to add fields in section lines

Cc @Tecnativa

@pedrobaeza pedrobaeza added this to the 12.0 milestone Jul 9, 2019
@pedrobaeza pedrobaeza requested a review from yajo July 9, 2019 11:17
pedrobaeza
pedrobaeza requested changes Jul 9, 2019
View reviewed changes
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The option subtotal shown when details are shown:

Selección_035

would be better having the name of the section on the subtotal:

Selección_038

There aren't now any tests also...

sale_layout_category_hide_detail/README.rst Outdated
*Report Layout Categories* if you want to hide its lines of
*Quotations / Sales Orders* and *Invoices* in the PDF report and in the
website.
This module allows you to set the new 'Show details' and 'Show subtotal'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change redaction to:

This module allows you to check/unchek the new 'Show details' and 'Show subtotal' flags in *Sale order... if you want to show or hide their lines or their subtotals in...

sale_layout_category_hide_detail/README.rst Outdated
field on *True* will be shown without its lines and with the subtotal.
#. In *Order lines* tab add a section line.
#. Add some product lines.
#. Add another section line, but this time, click on the *plus-circle* icon on
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you can put here inline (figure?) the icon.

sale_layout_category_hide_detail/__manifest__.py Outdated Show resolved Hide resolved
@pedrobaeza
Copy link
Member

Portal must be modified as well:

Selección_039

@ernestotejeda ernestotejeda force-pushed the 12.0-mig-sale_layout_category_hide_detail branch from 5b2ddd1 to 55adb91 Compare July 10, 2019 15:08
@ernestotejeda
Copy link
Member Author

The option subtotal shown when details are shown:

@pedrobaeza I kept the same behavior as in the previous version: The option subtotal shown when details are shown and when you uncheck show details, show subtotal option is hide

@ernestotejeda
Copy link
Member Author

Changes Done

@ernestotejeda ernestotejeda force-pushed the 12.0-mig-sale_layout_category_hide_detail branch from 3f3db1c to 53c3c2d Compare July 12, 2019 13:33
@ernestotejeda
Copy link
Member Author

Changes done, @yajo check it out please

yajo
yajo approved these changes Jul 15, 2019
View reviewed changes
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much simpler. Thanks!

@yajo yajo requested a review from pedrobaeza July 15, 2019 07:31
@ernestotejeda ernestotejeda force-pushed the 12.0-mig-sale_layout_category_hide_detail branch from 53c3c2d to eee4201 Compare August 12, 2019 14:56
@ernestotejeda
Copy link
Member Author

@pedrobaeza check it out

pedrobaeza
pedrobaeza requested changes Aug 13, 2019
View reviewed changes
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go for example to

http://3382265-70-eee420.runbot2-2.odoo-community.org/web#id=7&action=258&model=sale.order&view_type=form&menu_id=139

If you both print or go to portal, you don't see any lines. That's because they don't have any section involved. You must take that into account as well.

@ernestotejeda ernestotejeda force-pushed the 12.0-mig-sale_layout_category_hide_detail branch from eee4201 to 259ffb6 Compare August 13, 2019 16:08
@ernestotejeda
Copy link
Member Author

Thanks @pedrobaeza , even in the invoice report and in the portal invoice the lines were also not shown when there wasn't at least one section line. But I have already fixed it.

ernestotejeda and others added 4 commits August 13, 2019 18:33
@ernestotejeda @pedrobaeza
sale_layout_category_hide_detail: New module
abffd18 
Hide details for sections in sales orders and invoices for reports and
customer portal
@mvrodriguez @pedrobaeza
Translated using Weblate (Spanish)
047c874 
Currently translated at 100.0% (7 of 7 strings)

Translation: sale-reporting-11.0/sale-reporting-11.0-sale_layout_category_hide_detail
Translate-URL: https://translation.odoo-community.org/projects/sale-reporting-11-0/sale-reporting-11-0-sale_layout_category_hide_detail/es/
@ernestotejeda @pedrobaeza
[MIG] sale_layout_category_hide_detail: Migration to 12.0
60f9451
@pedrobaeza
[MIG] sale_layout_category_hide_detail: Migration scripts
2635924
@pedrobaeza pedrobaeza force-pushed the 12.0-mig-sale_layout_category_hide_detail branch from 259ffb6 to 2635924 Compare August 13, 2019 16:39
pedrobaeza
pedrobaeza approved these changes Aug 13, 2019
View reviewed changes
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything seems fine now. I have added the needed migration script when coming from previous version

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Rebased to 12.0-ocabot-merge-pr-70-by-pedrobaeza-bump-no, awaiting test results.

@OCA-git-bot OCA-git-bot mentioned this pull request Aug 13, 2019
Closed
4 tasks
@OCA-git-bot OCA-git-bot merged commit 2635924 into OCA:12.0 Aug 13, 2019
OCA-git-bot added a commit that referenced this pull request Aug 13, 2019
@OCA-git-bot
Merge PR #70 into 12.0
8130967 
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 8130967. Thanks a lot for contributing to OCA. ❤️

PS: Don't worry if GitHub says there are unmerged commits: it is due to a rebase before merge. All commits of this PR have been merged into 12.0.

@pedrobaeza pedrobaeza deleted the 12.0-mig-sale_layout_category_hide_detail branch December 30, 2019 15:28
@pedrobaeza
Copy link
Member

@ernestotejeda I have just found that you lost the file account_portal_templates.xml in the migration. I'm restoring it.

@pedrobaeza pedrobaeza changed the title 12.0 mig sale_layout_category_hide_detail [12.0][MIG] sale_layout_category_hide_detail Dec 30, 2019
@pedrobaeza
Copy link
Member

OK, seen that in invoices, the HTML is directly rendered from the same report than the PDF.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yajo yajo yajo approved these changes

@pedrobaeza pedrobaeza pedrobaeza approved these changes

Assignees
No one assigned
Labels
approved merged 🎉
Projects
None yet
Milestone
12.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ernestotejeda @pedrobaeza @OCA-git-bot @yajo @mvrodriguez