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] stock: remove incoming warehouse address from delivery slip #123594

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Jun 2, 2023

Steps to reproduce:

  • Configuration -> Settings -> Activate multi-locations.
  • Configuration -> Warehouses -> Three-step delivery.
  • Generate a three-step delivery (like through a sale order).
  • Select either PICK or PACK pickings.
  • Print the delivery slip.
  • There is a "warehouse address" field with the customer's address in it.

It makes little sense to display the current warehouse for internal transfers, as they keep being in the same warehouse after all. This doesn't impact inter-warehouse transit as in this case, an outgoing picking is done from one warehouse to the transit location and an incoming picking is done from the transit location to the other warehouse.
In both cases the addresses are correctly displayed and didn't use this 'warehouse address'.

opw-3335185


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

Forward-Port-Of: #123509
Forward-Port-Of: #123281

@robodoo
Copy link
Contributor

robodoo commented Jun 2, 2023

Pull request status dashboard

@fw-bot
Copy link
Contributor Author

fw-bot commented Jun 2, 2023

@clesgow @Whenrow cherrypicking of pull request #123281 failed.

stdout:

Auto-merging addons/stock/report/report_deliveryslip.xml
CONFLICT (content): Merge conflict in addons/stock/report/report_deliveryslip.xml

stderr:

19:39:29.550198 git.c:455               trace: built-in: git cherry-pick 1a0d28ab13c15ce9e005771b8aa0eadb5da99869
error: could not apply 1a0d28ab13c... [FIX] stock: remove incoming warehouse address from delivery slip
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.

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Jun 2, 2023
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Jun 2, 2023
@Whenrow Whenrow force-pushed the saas-16.1-15.0-fix-delivery-slip-warehouse-quwo-0J6U-fw branch from 58d9dd4 to 7f25083 Compare June 5, 2023 09:12
@Whenrow
Copy link
Contributor

Whenrow commented Jun 5, 2023

robodoo r+

@robodoo
Copy link
Contributor

robodoo commented Jun 5, 2023

@clesgow @Whenrow unable to stage: merge conflict

Steps to reproduce:
- Configuration -> Settings -> Activate multi-locations.
- Configuration -> Warehouses -> Three-step delivery.
- Generate a three-step delivery (like through a sale order).
- Select either PICK or PACK pickings.
- Print the delivery slip.
- There is a "warehouse address" field with the customer's adress in it.

It makes little sense to display the current warehouse for internal
transfers, as they keep being in the same warehouse after all.
This doesn't impact inter-warehouse transit as in this case, an outgoing
picking is done from one warehouse to the transit location and an
incoming picking is done from the transit location to the other
warehouse.
In both cases the addresses are correctly displayed and didn't use this
'warehouse address'.

opw-3335185

X-original-commit: 1449082
@Whenrow Whenrow force-pushed the saas-16.1-15.0-fix-delivery-slip-warehouse-quwo-0J6U-fw branch from 7f25083 to e93e39b Compare June 5, 2023 14:50
@Whenrow
Copy link
Contributor

Whenrow commented Jun 5, 2023

robodoo r+

robodoo pushed a commit that referenced this pull request Jun 5, 2023
Steps to reproduce:
- Configuration -> Settings -> Activate multi-locations.
- Configuration -> Warehouses -> Three-step delivery.
- Generate a three-step delivery (like through a sale order).
- Select either PICK or PACK pickings.
- Print the delivery slip.
- There is a "warehouse address" field with the customer's adress in it.

It makes little sense to display the current warehouse for internal
transfers, as they keep being in the same warehouse after all.
This doesn't impact inter-warehouse transit as in this case, an outgoing
picking is done from one warehouse to the transit location and an
incoming picking is done from the transit location to the other
warehouse.
In both cases the addresses are correctly displayed and didn't use this
'warehouse address'.

opw-3335185

closes #123594

X-original-commit: 1449082
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
@robodoo robodoo temporarily deployed to merge June 5, 2023 17:14 Inactive
@robodoo robodoo closed this Jun 5, 2023
@fw-bot fw-bot deleted the saas-16.1-15.0-fix-delivery-slip-warehouse-quwo-0J6U-fw branch June 19, 2023 17: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 OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants