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] purchase_sale_inter_company: Migration to 11.0 (from 8.0) WIP #97

Merged
merged 29 commits into from
Sep 26, 2019
Merged

[MIG] purchase_sale_inter_company: Migration to 11.0 (from 8.0) WIP #97

merged 29 commits into from
Sep 26, 2019

Conversation

carlosdauden
Copy link
Contributor

@carlosdauden carlosdauden commented Apr 25, 2018 •
edited by pedrobaeza
Loading

@carlosdauden carlosdauden force-pushed the 11.0-mig-purchase_sale_inter_company branch from cfcc4b4 to 6fae227 Compare April 25, 2018 14:12
@pedrobaeza
Copy link
Member

Why not starting from #95?

@pedrobaeza
Copy link
Member

Please squash commit history a bit.

@Joaco1980
Copy link

After installing the module it leaves inter company, when trying to configure it when I give to save changes the configuration is not saved correctly and it is
captura

@pedrobaeza pedrobaeza added this to the 11.0 milestone Jun 22, 2018
@carlosdauden carlosdauden force-pushed the 11.0-mig-purchase_sale_inter_company branch 10 times, most recently from 0f3c4a9 to bd63a3d Compare July 3, 2018 16:52
@carlosdauden carlosdauden force-pushed the 11.0-mig-purchase_sale_inter_company branch 2 times, most recently from 4021538 to 8bb95c9 Compare July 11, 2018 23:44
@carlosdauden carlosdauden force-pushed the 11.0-mig-purchase_sale_inter_company branch from 9829fe7 to e3e72f2 Compare August 7, 2018 08:54
@pedrobaeza
Copy link
Member

@carlosdauden, @Joaco1980's comment is addressed?

@Joaco1980
Copy link

After the last commits, it works for me correctly. what I do not understand because it has the dependence on the intercompany_invoice, because if you take out merchandise in the sale and invoices the delivery notes, in company B an invoice is generated but it is not related to the purchase order.

@yajo
Copy link
Member

yajo commented Sep 14, 2018

I added a commit that will make Travis fail until #110 is merged, given this was WIP already...

chienandalu
chienandalu reviewed Sep 14, 2018
View reviewed changes
purchase_sale_inter_company/models/sale_order.py
for order in self.filtered('auto_purchase_order_id'):
for line in order.order_line.sudo():
if line.auto_purchase_line_id:
line.auto_purchase_line_id.price_unit = line.price_unit
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't it be interesting to update the line qty if it's changed in the SO? (and maybe log the change into the PO chatter)

@pedrobaeza
Copy link
Member

@carlosdauden please fix tests of this module.

@chienandalu chienandalu force-pushed the 11.0-mig-purchase_sale_inter_company branch 3 times, most recently from 3e18c77 to f941497 Compare November 16, 2018 17:41
chafique-delli and others added 19 commits September 4, 2019 13:24
@chafique-delli @chienandalu
remove unnecessary dependencies in openerp.py and update of the unit …
555011e 
…price in purchase line when validating the sale order
@chafique-delli @chienandalu
add demo data and tests
1d1df84
@chafique-delli @chienandalu
fix partner_shipping_id in _prepare_sale_order_data method
34a9e22
@chafique-delli @chienandalu
add force_company in context when create inter company sale oder
0607494
@sebastienbeau @chienandalu
[FIX] fix setting the force company pass the cest_company as an id in…
c6e0131 
… order to load it with the correct context
@chafique-delli @chienandalu
replace sale_line_vals by sale_line_data
a90794c
@chafique-delli @chienandalu
fix tests
847e09f
@chafique-delli @chienandalu
fix following @elicoidal's comments and add french translation
0d112c4
@oca-transbot @chienandalu
OCA Transbot updated translations from Transifex
221e16c
@oca-transbot @chienandalu
OCA Transbot updated translations from Transifex
70900a1
@chafique-delli @chienandalu
fix domain for search users in _check_intercompany_product method
b8eb79d
@chafique-delli @chienandalu
fix multi-company access rights issue
684c1bf
@oca-transbot @chienandalu
OCA Transbot updated translations from Transifex
9bb6b9b
@carlosdauden @chienandalu
[MIG] purchase_sale_inter_company: Migration to 11.0 (from 8.0)
92115b7
@carlosdauden @chienandalu
[IMP] purchase_sale_inter_company: Recover intercompany user
9b39df6
@pedrobaeza @chienandalu
[FIX] purchase_sale_inter_company: Transfer dropship pickings correctly
73061db
@carlosdauden @chienandalu
[IMP] purchase_sale_inter_company: Better relation between docs. Tran…
d10562b 
…slate.
@yajo @chienandalu
[FIX] purchase_sale_inter_company: No buggy demo data
c7ae1d3 
Make tests compatible with OCA#110, for the same reason as the specified in that link.
@chienandalu
[FIX] tests and other issues
b584956
@chienandalu chienandalu force-pushed the 11.0-mig-purchase_sale_inter_company branch from 9e8aaa2 to b584956 Compare September 4, 2019 11:24
@chienandalu
Copy link
Member

@pedrobaeza Green tests

pedrobaeza
pedrobaeza approved these changes Sep 26, 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.

OK, let's merge this finally!

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 11.0-ocabot-merge-pr-97-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Sep 26, 2019
@OCA-git-bot
Merge PR #97 into 11.0
765c074 
Signed-off-by pedrobaeza
@OCA-git-bot OCA-git-bot merged commit b628a05 into OCA:11.0 Sep 26, 2019
@OCA-git-bot
Copy link
Contributor

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

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

@chienandalu chienandalu chienandalu left review comments

@pedrobaeza pedrobaeza pedrobaeza approved these changes

@rafaelbn rafaelbn rafaelbn approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 needs review
Projects
None yet
Milestone
11.0
Development

Successfully merging this pull request may close these issues.