Skip to content

[10.0][FIX] backport of SerpentCS mass_editing v10 port - #820

Merged
max3903 merged 6 commits into
OCA:10.0from
savoirfairelinux:10.0_serpentcs_backport
May 17, 2017
Merged

[10.0][FIX] backport of SerpentCS mass_editing v10 port#820
max3903 merged 6 commits into
OCA:10.0from
savoirfairelinux:10.0_serpentcs_backport

Conversation

@jbchouinard

@jbchouinard jbchouinard commented Apr 24, 2017

Copy link
Copy Markdown

I merged the v10 port of mass_editing by @JayVora-SerpentCS, found here: https://github.com/JayVora-SerpentCS/MassEditing/tree/10.0.

I split the code from the translations to make review easier.

Commit 4614486 fixes issue #806.

@jbchouinard jbchouinard changed the title 10.0 serpentcs backport [10.0][MIG] backport of SerpentCS mass_editing v10 port Apr 24, 2017
@jbchouinard jbchouinard changed the title [10.0][MIG] backport of SerpentCS mass_editing v10 port [10.0][FIX] backport of SerpentCS mass_editing v10 port Apr 24, 2017
@jbchouinard
jbchouinard force-pushed the 10.0_serpentcs_backport branch 3 times, most recently from c07f73c to d4dfde9 Compare April 24, 2017 21:00
@jbchouinard

jbchouinard commented Apr 25, 2017 •
edited
Loading

Copy link
Copy Markdown
Author

@JayVora-SerpentCS I was looking at this while merging the code:

domain="[('ttype', 'not in', ['reference', 'function']), ('model_id', 'in', model_list)]"/>

What's the reason for not simply using ('model_id', '=', model_id)?

I dont really understand what model_list is for since it's just set to [model_id] in the onchange on model_id.

EDIT: Nevermind I hadn't looked carefully, it's right there in the code, the parent models are added to model_list, so sometimes it has more than one id.

sbidoul
sbidoul reviewed May 4, 2017
View reviewed changes
Comment thread mass_editing/i18n/da.po Outdated
#. module: mass_editing
=======
#: model:ir.model,name:mass_editing.model_ir_model_fields
>>>>>>> c5fd7e3... Made Mass Editing module v10 compatible

@sbidoul sbidoul May 4, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@jbchouinard there is an unresolved conflict here.

@sbidoul

sbidoul commented May 4, 2017

Copy link
Copy Markdown
Member

Otherwise it works fine.

@ovnicraft

ovnicraft commented May 5, 2017

Copy link
Copy Markdown
Member

is the end of world w/o this module !, is ready to merge ?

@JayVora-SerpentCS

JayVora-SerpentCS commented May 7, 2017

Copy link
Copy Markdown

Should never ne model_list, rather. It was a backport from old version - #598 (comment)

@anhvu-sg

anhvu-sg commented May 16, 2017

Copy link
Copy Markdown
Member

Hello, can anyone merge this commit please ?

@jbchouinard
jbchouinard force-pushed the 10.0_serpentcs_backport branch from d4dfde9 to e384fd0 Compare May 16, 2017 14:50
@jbchouinard

jbchouinard commented May 16, 2017

Copy link
Copy Markdown
Author

@sbidoul oops fixed that. I grepped and didnt find any more unresolved conflicts

@joaoalf

joaoalf commented May 17, 2017

Copy link
Copy Markdown

👍 LGTM

Please someone merge this as soon as possible.

@max3903
max3903 merged commit ed54cfb into OCA:10.0 May 17, 2017
@JayVora-SerpentCS

JayVora-SerpentCS commented May 18, 2017

Copy link
Copy Markdown

This shouldn't have been merged dears! Some edits revert the actual Pr #598 and the old cherry picked commits @pedrobaeza

@ovnicraft

ovnicraft commented May 18, 2017

Copy link
Copy Markdown
Member

@JayVora-SerpentCS can you make a new PR ?

@JayVora-SerpentCS

JayVora-SerpentCS commented May 18, 2017

Copy link
Copy Markdown

I guess better to uncommit this one and correct, otherwise we will go in another loop of complexity.

@sbidoul

sbidoul commented May 18, 2017

Copy link
Copy Markdown
Member

We cannot uncommit, only revert. Please do another PR.

@JayVora-SerpentCS

JayVora-SerpentCS commented May 18, 2017

Copy link
Copy Markdown

I meant revert, sorry for the confusion.

jbchouinard added a commit to savoirfairelinux/server-tools that referenced this pull request May 23, 2017
@jbchouinard
Revert "[10.0][FIX] backport of SerpentCS mass_editing v10 port (OCA#820
af1fefc 
)"

This reverts commit ed54cfb.
@jbchouinard jbchouinard mentioned this pull request May 23, 2017
Closed
jnegrete pushed a commit to AlceConsorcio/server-tools that referenced this pull request Nov 11, 2017
@jbchouinard @jnegrete
[10.0][FIX] backport of SerpentCS mass_editing v10 port (OCA#820)
43122af 
* Made Mass Editing module v10 compatible
* Mass Editing module v10 translations
* Update ir_model_fields.py
* [FIX] mass_editing v10 port openerp->odoo
* [FIX] pep8
* [FIX] remove no-longer supported auto_refresh in view
ljimenezsidoo pushed a commit to PESOL/server-tools that referenced this pull request Mar 28, 2018
@jbchouinard Luis Adan JH
[10.0][FIX] backport of SerpentCS mass_editing v10 port (OCA#820)
73fbacd 
* Made Mass Editing module v10 compatible
* Mass Editing module v10 translations
* Update ir_model_fields.py
* [FIX] mass_editing v10 port openerp->odoo
* [FIX] pep8
* [FIX] remove no-longer supported auto_refresh in view
holdenrehg pushed a commit to holdenrehg-forks/server-tools that referenced this pull request Aug 21, 2018
@jbchouinard @holdenrehg
[10.0][FIX] backport of SerpentCS mass_editing v10 port (OCA#820)
650873f 
* Made Mass Editing module v10 compatible
* Mass Editing module v10 translations
* Update ir_model_fields.py
* [FIX] mass_editing v10 port openerp->odoo
* [FIX] pep8
* [FIX] remove no-longer supported auto_refresh in view
holdenrehg pushed a commit to holdenrehg-forks/server-tools that referenced this pull request Aug 21, 2018
@jbchouinard @holdenrehg
[10.0][FIX] backport of SerpentCS mass_editing v10 port (OCA#820)
cd731e6 
* Made Mass Editing module v10 compatible
* Mass Editing module v10 translations
* Update ir_model_fields.py
* [FIX] mass_editing v10 port openerp->odoo
* [FIX] pep8
* [FIX] remove no-longer supported auto_refresh in view
holdenrehg pushed a commit to holdenrehg-forks/server-tools that referenced this pull request Aug 21, 2018
@jbchouinard @holdenrehg
[10.0][FIX] backport of SerpentCS mass_editing v10 port (OCA#820)
0fb3651 
* Made Mass Editing module v10 compatible
* Mass Editing module v10 translations
* Update ir_model_fields.py
* [FIX] mass_editing v10 port openerp->odoo
* [FIX] pep8
* [FIX] remove no-longer supported auto_refresh in view
SiesslPhillip pushed a commit to grueneerde/OCA-server-tools that referenced this pull request Nov 20, 2024
@bt-admin
Merge pull request OCA#820 from OCA/14.0-ocabot-merge-pr-2198-by-pedr…
8292400 
…obaeza-bump-minor

Syncing from upstream OCA/server-tools (14.0-ocabot-merge-pr-2198-by-pedrobaeza-bump-minor)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sbidoul sbidoul sbidoul left review comments
@max3903 max3903 max3903 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@jbchouinard @sbidoul @ovnicraft @JayVora-SerpentCS @anhvu-sg @joaoalf @max3903