openerp-community team mailing list archive

[Alexandre Fayolle - camptocamp <alexandre.fayolle@xxxxxxxxxxxxxx>]

Alexandre Fayolle - camptocamp has proposed merging lp:~akretion-team/openerp-product-attributes/no-stock-dep into lp:openerp-product-attributes.

Requested reviews:
  Product Core Editors (product-core-editors)

For more details, see:
https://code.launchpad.net/~akretion-team/openerp-product-attributes/no-stock-dep/+merge/148417

(resubmitting after the merge of the other branch)

the commits message says it all:
[MIGR][openerp-product-attributes] removed the stock module dependency while keeping exactly the same features


-- 
https://code.launchpad.net/~akretion-team/openerp-product-attributes/no-stock-dep/+merge/148417
Your team OpenERP Community is subscribed to branch lp:openerp-product-attributes.

=== modified file 'product_custom_attributes/__openerp__.py'
--- product_custom_attributes/__openerp__.py	2013-02-06 22:30:08 +0000
+++ product_custom_attributes/__openerp__.py	2013-02-14 11:18:22 +0000
@@ -32,7 +32,11 @@
     """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com/',
+<<<<<<< TREE
     'depends': ['product', 'stock'],
+=======
+    'depends': ['product'],
+>>>>>>> MERGE-SOURCE
     'init_xml': [],
     'update_xml': [
            'security/ir.model.access.csv',

=== modified file 'product_custom_attributes/product_attribute_view.xml'
--- product_custom_attributes/product_attribute_view.xml	2013-02-06 14:37:21 +0000
+++ product_custom_attributes/product_attribute_view.xml	2013-02-14 11:18:22 +0000
@@ -10,8 +10,8 @@
     <data>
 
         <menuitem
-            id="menu_attribute_in_config_stock_product" name="Attributes"
-            parent="stock.menu_product_in_config_stock" sequence="20"/>
+            id="menu_attribute_in_config_product" name="Attributes"
+            parent="product.prod_config_main" sequence="20"/>
 
         <record id="attribute_set_form_view" model="ir.ui.view">
             <field name="name">attribute.set.form</field>
@@ -288,19 +288,19 @@
 
          <menuitem
              action="attribute_set_form_action" id="menu_attribute_set_action"
-             parent="product_custom_attributes.menu_attribute_in_config_stock_product" sequence="1"/>
+             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="1"/>
          <menuitem
              action="attribute_group_form_action" id="menu_attribute_group_action"
-             parent="product_custom_attributes.menu_attribute_in_config_stock_product" sequence="2"/>
+             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="2"/>
          <menuitem
              action="attribute_location_form_action" id="menu_attribute_location_action"
-             parent="product_custom_attributes.menu_attribute_in_config_stock_product" sequence="3"/>
+             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="3"/>
          <menuitem
              action="product_attribute_form_action" id="menu_product_attribute_action"
-             parent="product_custom_attributes.menu_attribute_in_config_stock_product" sequence="4"/>
+             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="4"/>
          <menuitem
              action="attribute_option_form_action" id="menu_attribute_option_action"
-             parent="product_custom_attributes.menu_attribute_in_config_stock_product" sequence="5"/>
+             parent="product_custom_attributes.menu_attribute_in_config_product" sequence="5"/>
 
     </data>
 </openerp>

=== modified file 'product_custom_attributes/security/ir.model.access.csv'
--- product_custom_attributes/security/ir.model.access.csv	2013-02-06 22:30:08 +0000
+++ product_custom_attributes/security/ir.model.access.csv	2013-02-14 11:18:22 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_product_custom_attributes_attribute_set_salemanager","product_custom_attributes_attribute_set","product_custom_attributes.model_attribute_set","base.group_sale_manager",1,1,1,1
 "access_product_custom_attributes_attribute_group_salemanager","product_custom_attributes_attribute_group","product_custom_attributes.model_attribute_group","base.group_sale_manager",1,1,1,1
@@ -14,3 +15,21 @@
 "access_product_custom_attributes_attribute_location_user","product_custom_attributes_attribute_location","product_custom_attributes.model_attribute_location","base.group_user",1,0,0,0
 "access_product_custom_attributes_product_attribute_user","product_custom_attributes_product_attribute","product_custom_attributes.model_product_attribute","base.group_user",1,0,0,0
 "access_product_custom_attributes_attribute_option_user","product_custom_attributes_attribute_option","product_custom_attributes.model_attribute_option","base.group_user",1,0,0,0
+=======
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_product_custom_attributes_attribute_set_salemanager","product_custom_attributes_attribute_set","product_custom_attributes.model_attribute_set","base.group_sale_manager",1,1,1,1
+"access_product_custom_attributes_attribute_group_salemanager","product_custom_attributes_attribute_group","product_custom_attributes.model_attribute_group","base.group_sale_manager",1,1,1,1
+"access_product_custom_attributes_attribute_location_salemanager","product_custom_attributes_attribute_location","product_custom_attributes.model_attribute_location","base.group_sale_manager",1,1,1,1
+"access_product_custom_attributes_product_attribute_salemanager","product_custom_attributes_product_attribute","product_custom_attributes.model_product_attribute","base.group_sale_manager",1,1,1,1
+"access_product_custom_attributes_attribute_option_salemanager","product_custom_attributes_attribute_option","product_custom_attributes.model_attribute_option","base.group_sale_manager",1,1,1,1
+"access_product_custom_attributes_attribute_set_manager","product_custom_attributes_attribute_set","product_custom_attributes.model_attribute_set","product.group_product_variant",1,1,1,1
+"access_product_custom_attributes_attribute_group_manager","product_custom_attributes_attribute_group","product_custom_attributes.model_attribute_group","product.group_product_variant",1,1,1,1
+"access_product_custom_attributes_attribute_location_manager","product_custom_attributes_attribute_location","product_custom_attributes.model_attribute_location","product.group_product_variant",1,1,1,1
+"access_product_custom_attributes_product_attribute_manager","product_custom_attributes_product_attribute","product_custom_attributes.model_product_attribute","product.group_product_variant",1,1,1,1
+"access_product_custom_attributes_attribute_option_manager","product_custom_attributes_attribute_option","product_custom_attributes.model_attribute_option","product.group_product_variant",1,1,1,1
+"access_product_custom_attributes_attribute_set_user","product_custom_attributes_attribute_set","product_custom_attributes.model_attribute_set","base.group_user",1,0,0,0
+"access_product_custom_attributes_attribute_group_user","product_custom_attributes_attribute_group","product_custom_attributes.model_attribute_group","base.group_user",1,0,0,0
+"access_product_custom_attributes_attribute_location_user","product_custom_attributes_attribute_location","product_custom_attributes.model_attribute_location","base.group_user",1,0,0,0
+"access_product_custom_attributes_product_attribute_user","product_custom_attributes_product_attribute","product_custom_attributes.model_product_attribute","base.group_user",1,0,0,0
+"access_product_custom_attributes_attribute_option_user","product_custom_attributes_attribute_option","product_custom_attributes.model_attribute_option","base.group_user",1,0,0,0
+>>>>>>> MERGE-SOURCE

=== modified file 'product_custom_attributes/wizard/open_product_by_attribute_set.xml'
--- product_custom_attributes/wizard/open_product_by_attribute_set.xml	2013-02-06 14:37:21 +0000
+++ product_custom_attributes/wizard/open_product_by_attribute_set.xml	2013-02-14 11:18:22 +0000
@@ -35,8 +35,7 @@
             <field name="help"></field>
         </record>
 
-        <menuitem action="open_product_by_attribute_set" id="open_product_wizard" parent="stock.menu_stock_product" sequence="20"/>
-
+        <menuitem action="open_product_by_attribute_set" id="open_product_wizard" parent="base.menu_product" sequence="20"/>
 
     </data>
 </openerp>