Fix double data elements #26
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yelizariev
reviewed
Oct 15, 2020
| r"\t\t<field name=\2domain_force\2>" | ||
| r"['|',('company_id','=',False)," | ||
| r"('company_id', 'in', company_ids)]</field>\n", | ||
| r"src_model": "binding_model" |
There was a problem hiding this comment.
Please move to a separate PR
| <record id="action_order_custom_field_a" model="ir.actions.act_window"> | ||
| <field name="name">Custom field A</field> | ||
| <field name="res_model">sale.report</field> | ||
| <field name="view_type">form</field> | ||
| <field name="view_mode">tree,form</field> | ||
| <field name="domain">[('custom_field','=','a')]</field> | ||
| </record> | ||
| </data> | ||
|
|
||
| <data noupdate="1"> |
yelizariev
reviewed
Oct 15, 2020
| <record name="demo_category" model="product.category"> | ||
| <field name="name">My Demo Category</field> | ||
| </record> | ||
| </data> |
There was a problem hiding this comment.
Can the solution don't add <data> until we have <data noupdate="1"> in the source?
There was a problem hiding this comment.
Maybe better in another PR. This one was not thought out all that well. But it was fixing an important bug
flachica
force-pushed
the
fix_multicompany
branch
from
b2c03b0
to
1672393
Compare
flachica
changed the title
|
Push forced |
yelizariev
reviewed
Oct 21, 2020
| @@ -1,13 +1,16 @@ | |||
| <?xml version="1.0" encoding="UTF-8"?> | |||
| <openerp> | |||
| <data> | |||
| <data noupdate="0"> | |||
There was a problem hiding this comment.
You add noupdate="0" here, but not in result xml. Why?
| @@ -25,9 +25,10 @@ | |||
| r"\.sudo\((?P<user>[^/)]+?)\)": r".with_user(\g<user>)", | |||
| r"\.suspend_security": ".sudo", | |||
| r"\"base_suspend_security\",\n": "", | |||
| r"self.env.user.company_id": r"self.env.company" | |||
There was a problem hiding this comment.
Better in a separate PR with a link to commit in odoo/odoo
| r"( |\t)*<openerp>(\n| |\t)*<data>": "<odoo>", | ||
| r"( |\t)*<\/data>(\n| |\t)*<\/openerp>": "</odoo>", | ||
| r"( |\t)*<openerp>": "<odoo>", | ||
| r"( |\t)*<\/openerp>": "</odoo>", |
There was a problem hiding this comment.
Should be fine. It fixes cases when we have
<data noupdate="1">
</data>
|
Also, you have conflicts in this PR |
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.