Skip to content

Commit 457ed4d

Browse files
committed
[FIX] *: don't delete standard attributes
Before this commit, the standard product attributes were deleted at the installation of the industry module. The problem is that deletion can easily be forbidden, as soon as there is a product created with this attribute. This commit therefore removes the deletion of standard attributes. It also reorders attributes such that industry-specific ones are at the top. *toy_store, micro_brewery, beverage_distributor task-4393043 closes #334 Signed-off-by: Vallaeys Valentin (vava) <[email protected]>
1 parent 8f02e80 commit 457ed4d

File tree

3 files changed

+18
-31
lines changed

3 files changed

+18
-31
lines changed

beverage_distributor/data/product_attribute.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,37 @@
44
<field name="display_type">color</field>
55
<field name="create_variant">no_variant</field>
66
<field name="name">Beer type</field>
7+
<field name="sequence" eval="-7"/>
78
</record>
89
<record id="product_attribute_11" model="product.attribute">
910
<field name="create_variant">no_variant</field>
1011
<field name="name">Soda type</field>
12+
<field name="sequence" eval="-1"/>
1113
</record>
1214
<record id="product_attribute_12" model="product.attribute">
1315
<field name="display_type">color</field>
1416
<field name="create_variant">no_variant</field>
1517
<field name="name">Wine type</field>
18+
<field name="sequence" eval="-2"/>
1619
</record>
1720
<record id="product_attribute_13" model="product.attribute">
1821
<field name="create_variant">no_variant</field>
1922
<field name="name">Local Brand</field>
23+
<field name="sequence" eval="-3"/>
2024
</record>
2125
<record id="product_attribute_14" model="product.attribute">
2226
<field name="create_variant">no_variant</field>
2327
<field name="name">IPA</field>
28+
<field name="sequence" eval="-4"/>
2429
</record>
2530
<record id="product_attribute_15" model="product.attribute">
2631
<field name="name">Age Limit</field>
2732
<field name="create_variant">no_variant</field>
33+
<field name="sequence" eval="-5"/>
2834
</record>
2935
<record id="product_attribute_16" model="product.attribute">
3036
<field name="create_variant">no_variant</field>
3137
<field name="name">Brand</field>
38+
<field name="sequence" eval="-6"/>
3239
</record>
33-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_1"/>
34-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_2"/>
35-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_3"/>
36-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_4"/>
37-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_5"/>
38-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_6"/>
39-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_7"/>
40-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_8"/>
41-
<delete model="product.attribute" id="website_sale.product_attribute_brand"/>
4240
</odoo>

micro_brewery/data/product_attribute.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,38 @@
44
<field name="name">Color</field>
55
<field name="display_type">color</field>
66
<field name="visibility">hidden</field>
7+
<field name="sequence" eval="-7"/>
78
</record>
89
<record id="product_attribute_4" model="product.attribute">
910
<field name="name">Size</field>
1011
<field name="display_type">pills</field>
1112
<field name="visibility">hidden</field>
13+
<field name="sequence" eval="-1"/>
1214
</record>
1315
<record id="beverage_product_attribute_10" model="product.attribute">
1416
<field name="display_type">color</field>
1517
<field name="create_variant">no_variant</field>
1618
<field name="name">Beer type</field>
19+
<field name="sequence" eval="-2"/>
1720
</record>
1821
<record id="beverage_product_attribute_13" model="product.attribute">
1922
<field name="create_variant">no_variant</field>
2023
<field name="name">Local Brand</field>
24+
<field name="sequence" eval="-3"/>
2125
</record>
2226
<record id="beverage_product_attribute_14" model="product.attribute">
2327
<field name="create_variant">no_variant</field>
2428
<field name="name">IPA</field>
29+
<field name="sequence" eval="-4"/>
2530
</record>
2631
<record id="beverage_product_attribute_15" model="product.attribute">
2732
<field name="name">Age Limit</field>
2833
<field name="create_variant">no_variant</field>
34+
<field name="sequence" eval="-5"/>
2935
</record>
3036
<record id="beverage_product_attribute_16" model="product.attribute">
3137
<field name="create_variant">no_variant</field>
3238
<field name="name">Brand</field>
39+
<field name="sequence" eval="-6"/>
3340
</record>
34-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_1"/>
35-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_2"/>
36-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_3"/>
37-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_4"/>
38-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_5"/>
39-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_6"/>
40-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_7"/>
41-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_8"/>
42-
<delete model="product.attribute" id="website_sale.product_attribute_brand"/>
4341
</odoo>

toy_store/data/product_attribute.xml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,24 @@
22
<odoo noupdate="1">
33
<record id="product_attribute_1" model="product.attribute">
44
<field name="name">Brand</field>
5-
<field name="sequence">1</field>
5+
<field name="sequence">-4</field>
66
<field name="create_variant">no_variant</field>
77
<field name="visibility">hidden</field>
88
</record>
99
<record id="product_attribute_2" model="product.attribute">
1010
<field name="name">Minimum recommended age</field>
11-
<field name="sequence">2</field>
11+
<field name="sequence">-3</field>
1212
<field name="create_variant">no_variant</field>
1313
<field name="visibility">hidden</field>
1414
</record>
1515
<record id="product_attribute_3" model="product.attribute">
1616
<field name="name">Number of players</field>
17-
<field name="sequence">3</field>
17+
<field name="sequence">-2</field>
1818
<field name="create_variant">no_variant</field>
1919
</record>
2020
<record id="product_attribute_4" model="product.attribute">
2121
<field name="name">Color</field>
22-
<field name="sequence">4</field>
22+
<field name="sequence">-1</field>
2323
<field name="display_type">color</field>
2424
</record>
25-
<delete model="product.attribute" id="website_sale.product_attribute_brand"/>
26-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_1"/>
27-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_2"/>
28-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_3"/>
29-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_4"/>
30-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_5"/>
31-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_6"/>
32-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_7"/>
33-
<delete model="product.attribute" id="product_barcodelookup.product_attribute_lookup_8"/>
3425
</odoo>

0 commit comments

Comments
 (0)