// MERGE product_multistore branch : product fields are now editable per shop

install-dev/data/xml/configuration.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity_configuration>
-  <fields id="name" sql="a.name &lt;&gt; 'PS_LANG_DEFAULT' AND a.id_shop IS NULL AND a.id_group_shop IS NULL" null="1">
+  <fields id="name" sql="a.name &lt;&gt; 'PS_LANG_DEFAULT' AND a.id_shop IS NULL AND a.id_shop_group IS NULL" null="1">
     <field name="name"/>
     <field name="value"/>
   </fields>

install-dev/data/xml/delivery.xml

@@ -2,7 +2,7 @@
 <entity_delivery>
   <fields class="Delivery" sql="a.id_carrier = 1">
     <field name="id_shop"/>
-    <field name="id_group_shop"/>
+    <field name="id_shop_group"/>
     <field name="id_carrier" relation="carrier"/>
     <field name="id_range_price" relation="range_price"/>
     <field name="id_range_weight" relation="range_weight"/>

install-dev/data/xml/tab.xml

@@ -295,7 +295,7 @@
       <class_name>AdminShop</class_name>
     </tab>
     <tab id="Group_Shops" id_parent="Shops" active="1">
-      <class_name>AdminGroupShop</class_name>
+      <class_name>AdminShopGroup</class_name>
     </tab>
     <tab id="Shop_Urls" id_parent="Shops" active="1">
       <class_name>AdminShopUrl</class_name>