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

[MIG] stock_reserve_sale: Migration to 12.0 #636

Closed
wants to merge 42 commits into from
Closed

[MIG] stock_reserve_sale: Migration to 12.0 #636

wants to merge 42 commits into from

Conversation

hzh0292
Copy link

@hzh0292 hzh0292 commented Jun 28, 2019

No description provided.

@pedrobaeza
Copy link
Member

I'm afraid this still lacks the commit history. You can see it because there's only one commit.

@hzh0292 hzh0292 mentioned this pull request Jun 28, 2019
Closed
54 tasks
@hzh0292
Copy link
Author

hzh0292 commented Jun 28, 2019

I'm afraid this still lacks the commit history. You can see it because there's only one commit.

So how can I do in the right way?

@pedrobaeza
Copy link
Member

Following the given steps. Maybe you didn't replace where it says $MODULE with the proper module name.

@hzh0292
Copy link
Author

hzh0292 commented Jun 28, 2019

Following the given steps. Maybe you didn't replace where it says $MODULE with the proper module name.

I did fllowing the given steps and I already replaced the MODULE with the module name.

@pedrobaeza
Copy link
Member

But the commits are not here... I'll take this branch later and try to fix it.

@rousseldenis
Copy link
Sponsor Contributor

rousseldenis commented Jun 28, 2019 •
edited

@hzh0292 As the module is not present in 11, I suppose you took it from 10, so in git format patch, replace 11 by 10

guewen and others added 23 commits June 28, 2019 16:06
@guewen @hzh0292
[ADD] started stock_reserve_sale to reserve lines of quotations
5e003ba
@guewen @hzh0292
[IMP] continued the stock_reserve_sale module
a3502d6
@guewen @hzh0292
[ADD] release and update methods
38f16cd
@guewen @hzh0292
[ADD] started to handle the modification of sale order lines when a r…
fe66e87 
…eservation exists.

product and uom ask to release the reservation before changing,
price_unit is copied to the reservation move
a change of quantity will warn the user to update the reservation manually (the user can choose a different quantity to reserve)
@guewen @hzh0292
[IMP] warn when the quantity of a line with a reservation is changed …
0b4af01 
…that the qty of the reservation will be changed
@guewen @hzh0292
[CHG] should not be able to change the type (mto, mts) of a sales lin…
5f6fc81 
…e with a stock reservation
@guewen @hzh0292
[CHG] release the reservations on the confirmation of sales orders
76b940e
@guewen @hzh0292
[FIX] wrong field name
60e6691
@guewen @hzh0292
[CHG] reverse cardinality: many stock.reservation have 1 sale.order.l…
40a52bc 
…ine. in fact usually it would be 1-1 but make more sense to have the relation on stock.reservation
@guewen @hzh0292
[IMP] cancelling a sales order cancels the stock reservations
8751875
@guewen @hzh0292
[ADD] test for reservation of a sales order
42d1516
@guewen @hzh0292
[ADD] test for reservation of sales order lines
e8906df
@guewen @hzh0292
[IMP] description in __openerp__.py
4b40f74
@guewen @hzh0292
[CHG] hide the stock reservation on the line's form
8f337ba
@guewen @hzh0292
[FIX] in form view of sales line, remove the update button (automatic…
5eb4ca7 
…) and remove the cancel button (already displayed on the header)
@gurneyalex @hzh0292
mark unported module as uninstallable
ded49f4
@yvaucher @hzh0292
reactivate module stock_reserve_sale
94dd6ec
@yvaucher @hzh0292
port models and methods to api 8.0
67cb3ba
@yvaucher @hzh0292
change product_qty to product_uom_qty
8526cd1
@yvaucher @hzh0292
remove procure_method from sale.order.lines
19b43ec
@yvaucher @hzh0292
set test product 12 to MTO
ff1bdd9
@yvaucher @hzh0292
fix unit of mesure on sale order in tests
5fdd5e7
@yvaucher @hzh0292
fix yaml test by writing route_ids using python instead of record
740f4fa
@hzh0292 hzh0292 force-pushed the 12.0-mig-stock_reserve_sale branch from 450ca9b to b90c8f0 Compare June 28, 2019 08:12
@hzh0292
Copy link
Author

hzh0292 commented Jun 28, 2019

@hzh0292 As the module is not present in 11, I suppose you took it from 10, so in git format patch, replace 11 by 10

In fact,I took it from 9.0 branch.The 10.0 was not a complete migration from 8.0.

@rousseldenis
Copy link
Sponsor Contributor

In fact,I took it from 9.0 branch.The 10.0 was not a complete migration from 8.0.

That looks better !

@rousseldenis rousseldenis added this to the 12.0 milestone Jul 6, 2019
@rven
Copy link

rven commented Aug 5, 2019

Can you have a look at this #678?

@hzh0292
Copy link
Author

hzh0292 commented Aug 5, 2019

Can you have a look at this #678?

OK,I have seen this and I will check and add the code into the PR.

@hzh0292
Enable Route on Sales Order Line
1b3e5b6 
Take "Enable Route on Sales Order Line" into account as rven suggested.
rousseldenis
rousseldenis approved these changes Nov 11, 2019
View reviewed changes
Copy link
Sponsor Contributor

@rousseldenis rousseldenis left a comment

Choose a reason for hiding this comment

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

Code review. Minor comment.

Could you squash your commits into Migration one ?

stock_reserve_sale/models/sale.py Outdated Show resolved Hide resolved
@rousseldenis
Copy link
Sponsor Contributor

Depends on #637

@hzh0292 Could you check travis ?

@hzh0292 @rousseldenis
Update stock_reserve_sale/models/sale.py
c602c0d 
Co-Authored-By: Denis Roussel (ACSONE) <rousseldenis@users.noreply.github.com>
@oca-clabot
Copy link

Hey @hzh0292, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/cla
Here is a list of the users:

Appreciation of efforts,
OCA CLAbot

rousseldenis
rousseldenis reviewed Dec 9, 2019
View reviewed changes
stock_reserve_sale/models/sale.py Outdated
from odoo.fields import first
return first(self.route_id.rule_ids.sorted(
key=lambda r: (r.route_sequence, r.sequence)))
from odoo.fields import first
Copy link
Sponsor Contributor

Choose a reason for hiding this comment

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

Put import on beginning of the file

manuelcalerosolis pushed a commit to xtendoo-corporation/stock-logistics-warehouse that referenced this pull request Oct 21, 2020
@OCA-git-bot
Merge PR OCA#636 into 12.0
6c44411 
Signed-off-by pedrobaeza
@rousseldenis
Copy link
Sponsor Contributor

@hzh0292 Could you squash your commits and check tests?

@dreispt
Copy link
Sponsor Member

dreispt commented Dec 4, 2021

Migration commits need to be squashed.

@github-actions
Copy link

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Apr 10, 2022
@rousseldenis
Copy link
Sponsor Contributor

@hzh0292

@hzh0292 hzh0292 closed this Apr 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rven rven rven left review comments

@rousseldenis rousseldenis rousseldenis approved these changes

Assignees
No one assigned
Labels
needs fixing needs review stale PR/Issue without recent activity, it'll be soon closed automatically.
Projects
None yet
Milestone
12.0
Development

Successfully merging this pull request may close these issues.

None yet