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 purchase sale inter company #120

Merged
merged 45 commits into from
Jan 16, 2020
Merged

12.0 mig purchase sale inter company #120

merged 45 commits into from
Jan 16, 2020

Conversation

mourad-ehm
Copy link
Contributor

No description provided.

@pedrobaeza pedrobaeza added this to the 12.0 milestone Feb 20, 2019
@OCA-git-bot OCA-git-bot mentioned this pull request Feb 20, 2019
Closed
9 tasks
elicoidal
elicoidal previously requested changes Feb 21, 2019
View reviewed changes
Copy link

@elicoidal elicoidal left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution.
Mostly details. no tests

purchase_sale_inter_company/README.rst Outdated Show resolved Hide resolved
purchase_sale_inter_company/README.rst Outdated Show resolved Hide resolved
purchase_sale_inter_company/README.rst Outdated Show resolved Hide resolved
purchase_sale_inter_company/README.rst Outdated Show resolved Hide resolved
purchase_sale_inter_company/README.rst Outdated Show resolved Hide resolved
purchase_sale_inter_company/tests/inter_company_purchase_sale.xml Outdated Show resolved Hide resolved
purchase_sale_inter_company/tests/test_inter_company_purchase_sale.py Outdated Show resolved Hide resolved
purchase_sale_inter_company/views/purchase_order_view.xml Outdated Show resolved Hide resolved
purchase_sale_inter_company/views/res_company_view.xml Outdated Show resolved Hide resolved
purchase_sale_inter_company/views/res_config_view.xml Outdated Show resolved Hide resolved
@bealdav
Copy link
Member

bealdav commented Feb 21, 2019

Travis tell us

odoo.exceptions.UserError: ("You try to install module 'purchase_sale_inter_company' that depends on module 'account_invoice_inter_company'.\nBut the latter module is not available in your system.", '')

@astirpe
Copy link
Member

astirpe commented Mar 26, 2019 •
edited
Loading

I didn't try the module, but I'm wondering:

since Odoo 12.0, purchase and sales apps do not depend on stock.
So this module could be split in two:

  • purchase_sale_inter_company, not depending on stock
  • purchase_sale_stock_inter_company, depending on sale_stock, purchase_stock and purchase_sale_inter_company

Does it make sense?

@bealdav
Copy link
Member

bealdav commented Mar 26, 2019

@astirpe you're problably right.

On our side at akretion we have no use case of multi companies of services only.

I think it could not be happen very often (probably never with customers of active partners). Whatever, if partners have a such use case, then may ask us to split for these uses cases (and probably finance it).

#buildaccordingtorealneedsfirst ;-)

What do you think ?

@astirpe
Copy link
Member

astirpe commented Mar 27, 2019

@bealdav yes I agree. 👍 Anyway do you think it is worth to mention it in the Roadmap of the readme?

@bealdav
Copy link
Member

bealdav commented Mar 27, 2019

Yes it can be mentionned in the readme.

@bealdav
Copy link
Member

bealdav commented May 27, 2019

@mourad-ehm please could you fix this PR and update readme. Thanks

@rafaelbn
Copy link
Member

Hello, in 2018 we migrate to v11 here #97

We did a big work and we have been using in production in several multi-companies for long time

I think it's a good idea to get v11 merged and after that review here

But I'm not and expert in this matter

@rafaelbn rafaelbn mentioned this pull request Aug 16, 2019
Merged
@pedrobaeza
Copy link
Member

This can now use #97, as it's on its way to be merged

@pedrobaeza pedrobaeza mentioned this pull request Oct 15, 2019
Closed
@elvise
Copy link

elvise commented Jan 11, 2020

any good progress here ?
How can i help?

chafique-delli and others added 15 commits January 13, 2020 14:44
@chafique-delli @mourad-ehm
[ADD] purchase_sale_inter_company module
45f5b1c
@chafique-delli @mourad-ehm
add warehouse_id in the values for create sale order
398dfb7
@chafique-delli @mourad-ehm
refactor code after add dependency on account_invoice_inter_company
5dbf94c
@chafique-delli @mourad-ehm
check product is intercompany
0f201df
@chafique-delli @mourad-ehm
extend invoice_method field and add action_cancel method for purchase…
c1b3243 
… and auto_purchase_line_id field in sale_order_line
@chafique-delli @mourad-ehm
rename inter_company_po_to_so_view.xml to res_company_view.xml and ad…
d87d698 
…d purchase_order_view.xml
@chafique-delli @mourad-ehm
use product_id_change_with_wh method for return sale line data
3cbaf25
@chafique-delli @mourad-ehm
fix README file
f1a26c3
@chafique-delli @mourad-ehm
remove inter company user
04cc71e
@chafique-delli @mourad-ehm
remove unnecessary dependencies in openerp.py and update of the unit …
d537db7 
…price in purchase line when validating the sale order
@chafique-delli @mourad-ehm
add demo data and tests
4192384
@chafique-delli @mourad-ehm
fix partner_shipping_id in _prepare_sale_order_data method
9b92560
@chafique-delli @mourad-ehm
add force_company in context when create inter company sale oder
2b2684e
@sebastienbeau @mourad-ehm
[FIX] fix setting the force company pass the cest_company as an id in…
29ceaa9 
… order to load it with the correct context
@chafique-delli @mourad-ehm
replace sale_line_vals by sale_line_data
03ddb01
@mourad-ehm mourad-ehm force-pushed the 12.0-mig-purchase_sale_inter_company branch from 27734b7 to 6bd8348 Compare January 13, 2020 13:54
@mourad-ehm
Copy link
Contributor Author

Hi @elvise, I rebased my branch and test in OK now.

@elvise
Copy link

elvise commented Jan 15, 2020

Hi @elvise, I rebased my branch and test in OK now.

Can I help for complete merge ?

@mourad-ehm
Copy link
Contributor Author

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Sorry @mourad-ehm you are not allowed to merge.

To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons.

If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the maintainers key of its manifest.

@mourad-ehm
Copy link
Contributor Author

mourad-ehm commented Jan 16, 2020 •
edited
Loading

Hi @elvise, I rebased my branch and test in OK now.

Can I help for complete merge ?

I think that it can be merged now. If you are allowed to merge, could you do it ?

@pedrobaeza pedrobaeza dismissed elicoidal’s stale review January 16, 2020 08:39

Not able to re-review

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Jan 16, 2020
@OCA-git-bot
Merge PR #120 into 12.0
ff8dc25 
Signed-off-by pedrobaeza
@OCA-git-bot OCA-git-bot merged commit 6bd8348 into OCA:12.0 Jan 16, 2020
@OCA-git-bot
Copy link
Contributor

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

@bealdav bealdav deleted the 12.0-mig-purchase_sale_inter_company branch January 16, 2020 09:01
SilvioC2C pushed a commit to camptocamp/multi-company that referenced this pull request Mar 7, 2023
BSSBG-2677 : Show tag reference on account.move line (OCA#120)
499a19f 
Co-authored-by: Juliette Blanc <jblanc@wrk72.wrk.cby.camptocamp.com>
@MiquelRForgeFlow MiquelRForgeFlow mentioned this pull request Jan 8, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bealdav bealdav bealdav approved these changes

@chafique-delli chafique-delli chafique-delli approved these changes

@elicoidal elicoidal elicoidal left review comments

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