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

Revert "Revert "Fixing some errors so that base_custom_attributes and product_custom_…"" #23

Open
wants to merge 1 commit into
base: 8.0
Choose a base branch
from
Open

Revert "Revert "Fixing some errors so that base_custom_attributes and product_custom_…"" #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base_custom_attributes/__openerp__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
'custom_attributes_view.xml',
],
'demo_xml': [],
'installable': False,
'installable': True,
'active': False,
'external_dependencies' : {
'python' : ['unidecode'],
Expand Down
2 changes: 1 addition & 1 deletion product_custom_attributes/__openerp__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
'wizard/open_product_by_attribute_set.xml',
],
'demo_xml': [],
'installable': False,
'installable': True,
'active': False,
}

2 changes: 1 addition & 1 deletion product_custom_attributes/product.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from openerp.osv import fields
from openerp.osv.osv import except_osv
from openerp.osv.orm import setup_modifiers
from tools.translate import translate
from openerp.tools.translate import translate
from lxml import etree

class product_template(Model):
Expand Down
4 changes: 2 additions & 2 deletions product_custom_attributes/product_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<record model="ir.ui.view" id="product_product_form_view_set_button">
<field name="name">attributes.product.normal.form</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view" />
<field name="inherit_id" ref="product.product_template_only_form_view" />
<field name="arch" type="xml">
<xpath expr="/form/sheet/notebook/page[@string='Information']/group/group/field[@name='variants']/.." position="after">
<xpath expr="//page[@name='variants']//field[@name='attribute_line_ids']" position="after">
<group name="attribute_fields">
<field name="attribute_set_id" />
<button name="open_attributes" string="Open Attributes" type="object" icon="gtk-ok" attrs="{'invisible':[('attribute_set_id', '=', False)]}"/>
Expand Down
3 changes: 1 addition & 2 deletions product_custom_attributes/wizard/open_product_by_attribute_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
###############################################################################

from openerp.osv.orm import TransientModel
from osv import fields

from openerp.osv import fields

class open_product_by_attribute_set(TransientModel):
_name = 'open.product.by.attribute.set'
Expand Down