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][FIX] base: inherit the industry field from parent #109248

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jan 5, 2023

Steps to reproduce:

  • install "contacts" and "sale_management" module;
  • create a company contact with a value for "Industry" (Sales & Purchase tab);
  • create an employee who works in this company;
  • create two orders (one with the company and one with the employee);
  • go to sales reporting tab and select the pivot view;
  • filter by "Customer Industry" and then by "Customer";

Issue:
The employee is not placed in the right category of industry. He should be in the same category as the company he works in.

Cause:
When creating a contact, the industry_id field is not passed from parent to children.
(Moreover, this field being invisible for an "individual" contact, it is not possible to give it a value without using the studio application.)

Solution:
Add industry_id to _commercial_fields.

opw-3085032

Forward-Port-Of: #107918

@robodoo
Copy link
Contributor

robodoo commented Jan 5, 2023

@fw-bot
Copy link
Contributor Author

fw-bot commented Jan 5, 2023

@thle-odoo @tivisse cherrypicking of pull request #107918 failed.

stdout:

Auto-merging odoo/addons/base/models/res_partner.py
CONFLICT (content): Merge conflict in odoo/addons/base/models/res_partner.py

stderr:

17:57:56.579694 git.c:455               trace: built-in: git cherry-pick 6886d1d575f731bed7b1704ef4aa5f6acb861320
error: could not apply 6886d1d575f... [FIX] base: inherit the industry field from parent
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
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.

@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Jan 5, 2023
@robodoo robodoo added conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot labels Jan 5, 2023
Steps to reproduce:
   - install "contacts" and "sale_management" module;
   - create a company contact with a value for "Industry" (Sales & Purchase tab);
   - create an employee who works in this company;
   - create two orders (one with the company and one with the employee);
   - go to sales reporting tab and select the pivot view;
   - filter by "Customer Industry" and then by "Customer";

Issue:
   The employee is not placed in the right category of industry. He should be in the same category as the company he works in.

Cause:
   When creating a contact, the `industry_id` field is not passed from parent to children.
   (Moreover, this field being invisible for an "individual" contact, it is not possible to give it a value without using the studio application.)

Solution:
   Add `industry_id` to `_commercial_fields`.

opw-3085032

X-original-commit: 8aa4732
@thle-odoo thle-odoo force-pushed the saas-15.3-14.0-opw-3085032-grouping_sector_of_activity-thle-kvdX-fw branch from 2500f7b to b6799a4 Compare January 6, 2023 07:47
@thle-odoo
Copy link
Contributor

@robodoo r+

@C3POdoo C3POdoo requested review from a team, rco-odoo and Julien00859 and removed request for a team January 6, 2023 07:48
robodoo pushed a commit that referenced this pull request Jan 6, 2023
Steps to reproduce:
   - install "contacts" and "sale_management" module;
   - create a company contact with a value for "Industry" (Sales & Purchase tab);
   - create an employee who works in this company;
   - create two orders (one with the company and one with the employee);
   - go to sales reporting tab and select the pivot view;
   - filter by "Customer Industry" and then by "Customer";

Issue:
   The employee is not placed in the right category of industry. He should be in the same category as the company he works in.

Cause:
   When creating a contact, the `industry_id` field is not passed from parent to children.
   (Moreover, this field being invisible for an "individual" contact, it is not possible to give it a value without using the studio application.)

Solution:
   Add `industry_id` to `_commercial_fields`.

opw-3085032

closes #109248

X-original-commit: 8aa4732
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Lefebvre Thomas (thle) <thle@odoo.com>
@robodoo robodoo temporarily deployed to merge January 6, 2023 09:42 Inactive
@robodoo robodoo closed this Jan 6, 2023
@fw-bot fw-bot deleted the saas-15.3-14.0-opw-3085032-grouping_sector_of_activity-thle-kvdX-fw branch January 20, 2023 09:47
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 OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants