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

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
parent d4d1c35cb9
commit 0c2dd0cd2f
134 changed files with 3185 additions and 1789 deletions
@@ -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"/>