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

[11.0][MIG] sale_exception #576

Merged
merged 11 commits into from
Jan 16, 2018
Merged

Conversation

simahawk
Copy link
Contributor

No description provided.

@simahawk simahawk mentioned this pull request Nov 28, 2017
65 tasks
@pedrobaeza pedrobaeza added this to the 11.0 milestone Nov 28, 2017
@simahawk
Copy link
Contributor Author

missing dependency on OCA/server-tools#1025.

@pedrobaeza I lost some OCA Transbot commits because of some bad conflicts on rebase cleanup. Can we rely on transbot to update them again when merged or should I try to recover all of them?

@pedrobaeza
Copy link
Member

As this is a new branch, it will be a new project, so you have to put the correct translations. The best option is: copy translation files from 10.0, make a commit, and squash it with latest "OCA Transbot commit".

As a side note, these conflicts happened when dirty merge/pull operations have been done in the branch in the past. Fortunately, we can fix them here for the future.

@simahawk
Copy link
Contributor Author

ok then, I'll drop all of them and get back from v10. Thanks

@simahawk simahawk force-pushed the 11-mig-sale_exception branch from a5cec45 to d766a9d Compare November 29, 2017 10:03
@simahawk
Copy link
Contributor Author

@pedrobaeza translations recovered (no transbot commit to squash with tho).
About build: it complains about base_exception not found but I added this https://github.com/simahawk/sale-workflow/blob/a5cec451f89af26433a650d7a8bd5cd83c913856/oca_dependencies.txt
Is that correct?

@pedrobaeza
Copy link
Member

The problem is not about base_exception, but another. Please check Travis logs.

@simahawk
Copy link
Contributor Author

@pedrobaeza ah sorry, I looked at an old build that was still failing for dependency issue :(

Copy link
Member

@StefanRijnhart StefanRijnhart left a comment

Choose a reason for hiding this comment

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

Tests are green, translations are salvaged! Perhaps squash your own commits @simahawk?

@simahawk simahawk force-pushed the 11-mig-sale_exception branch from a6df178 to 57507fb Compare December 1, 2017 22:57
@@ -0,0 +1,2 @@
# base_exception v11 https://github.com/OCA/server-tools/pull/1025
server-tools https://github.com/akretion/server-tools 11.0-mig-base_exception
Copy link
Contributor

Choose a reason for hiding this comment

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

Please do not forget to remove this.

atchuthan and others added 7 commits December 5, 2017 17:16
Rule should only count available stock from selected warehouse from sale order.
Without warehouse in context, it currently sums all stock available in all warehouses.
The previous parent menu has an action attached, and with these modules,
it can't be clicked.
* [FIX] sale_exception confirm wizard
* [FIX] add test of test_all_draft_orders & flake8 & readme.rst
* [FIX] improve codecov test
* [FIX] delete odl translation
* [FIX] add Camptocamp to author
* [FIX] readme.rst
Raise SingletonError when you have a recordset with multiple sale order.
This restore the capability to write on multiple sale.order
@simahawk simahawk force-pushed the 11-mig-sale_exception branch from 57507fb to b433f80 Compare December 5, 2017 16:20
@StefanRijnhart
Copy link
Member

Travis no like :-(

2017-12-05 16:25:17,964 5514 ERROR openerp_test odoo.modules.registry: Model base.exception.test.purchase.line has no table.
2017-12-05 16:25:17,964 5514 ERROR openerp_test odoo.modules.registry: Model base.exception.test.purchase has no table.

@simahawk
Copy link
Contributor Author

simahawk commented Dec 6, 2017

I know. I'll get back on this later. Anyway the error is related to base_exception that has been merged into server-tools w/out build issues (as far as I see).

Ahh, I guess that it's because the test models are registered only w/ --test-enable or ODOO_TEST_ENABLE env var. But, modules from other repos are installed "normally".
So, it works on server-tools branch but not here 😢

@simahawk
Copy link
Contributor Author

simahawk commented Dec 6, 2017

It's really strange because on runbot is not failing and the base module is installed as well w/out test enabled:

/home/odoo/OCB-11.0/odoo-bin -d openerp_template --log-level=info --stop-after-init --init base_exception,sale,base

On travis I see:

 /home/travis/OCB-11.0/odoo-bin -d openerp_test --db-filter=^openerp_test$ --stop-after-init --log-level info --log-handler openerp.tools.yaml_import:DEBUG --test-enable --init sale_exception

Maybe is due to the fact that those models are inside tests folder 🤔

@mourad-ehm
Copy link
Contributor

I had a same problem with purchase exception OCA/purchase-workflow#467

@simahawk
Copy link
Contributor Author

simahawk commented Dec 6, 2017

@mourad-ehm I think is because of this OCA/server-tools#1025 (comment)
That's one of the reason why I usually put them into models/.

@JordiBForgeFlow
Copy link
Member

@simahawk PR OCA/server-tools#1111 fixes the problem in base_exception

@simahawk simahawk force-pushed the 11-mig-sale_exception branch from 761f790 to 7f50c72 Compare January 12, 2018 07:58
@simahawk simahawk force-pushed the 11-mig-sale_exception branch 3 times, most recently from cef2b0c to 1acac57 Compare January 12, 2018 08:27
@simahawk
Copy link
Contributor Author

@jbeficent test fixed, thank ;)
@lreficent oca deps updated.
@pedrobaeza ready for another review and merge? 😉

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

LGTM
micro remarks

@@ -0,0 +1,3 @@
# -*- coding: utf-8 -*-
Copy link

Choose a reason for hiding this comment

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

can be removed

@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
Copy link

Choose a reason for hiding this comment

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

can be removed too

@@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-
Copy link

Choose a reason for hiding this comment

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

can be removed

@@ -0,0 +1,72 @@
# -*- coding: utf-8 -*-
Copy link

Choose a reason for hiding this comment

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

same

@@ -0,0 +1,72 @@
# -*- coding: utf-8 -*-
# Copyright 2011 Akretion, Camptocamp, Sodexis
# Copyright 2017 Akretion, Camptocamp
Copy link

Choose a reason for hiding this comment

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

2018

@@ -0,0 +1,94 @@
# -*- coding: utf-8 -*-
Copy link

Choose a reason for hiding this comment

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

same

@@ -0,0 +1,94 @@
# -*- coding: utf-8 -*-
# Copyright 2011 Akretion, Camptocamp, Sodexis
# Copyright 2017 Akretion, Camptocamp
Copy link

Choose a reason for hiding this comment

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

2018

@@ -0,0 +1,2 @@
# -*- coding: utf-8 -*-
Copy link

Choose a reason for hiding this comment

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

can be removed

@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
Copy link

Choose a reason for hiding this comment

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

same

@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Copyright 2011 Akretion, Camptocamp, Sodexis
# Copyright 2017 Akretion, Camptocamp
Copy link

Choose a reason for hiding this comment

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

2018

@simahawk simahawk force-pushed the 11-mig-sale_exception branch from 1acac57 to e747319 Compare January 16, 2018 09:30
@simahawk simahawk force-pushed the 11-mig-sale_exception branch from e747319 to b032493 Compare January 16, 2018 09:31
@simahawk
Copy link
Contributor Author

@OleksandrPaziuk tnx! all comments addressed.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Great work!


@api.multi
def action_confirm(self):
self.ensure_one()
Copy link
Contributor

Choose a reason for hiding this comment

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

Question, self.ensure_one() in multi ? Do we want to be able to call the wizard on multiple SO ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's a button on a wizard: you won't use it on multiple SO and in any case you can relate only one SO per wiz, so... :)

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor

@leemannd leemannd left a comment

Choose a reason for hiding this comment

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

I have only one question before approval

@simahawk
Copy link
Contributor Author

@StefanRijnhart tnx for reviewing: can you hit the button? 😜

@StefanRijnhart StefanRijnhart merged commit a6aa6b9 into OCA:11.0 Jan 16, 2018
@StefanRijnhart
Copy link
Member

I hit that big and powerful button, and it worked.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants