diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php index b5fc1c37b..61fb461f1 100755 --- a/controllers/admin/AdminSpecificPriceRuleController.php +++ b/controllers/admin/AdminSpecificPriceRuleController.php @@ -182,7 +182,7 @@ class AdminSpecificPriceRuleController extends AdminController 'size' => 6, 'maxlength' => 10, 'value' => '1', - 'required' => true + 'required' => true, ), array( 'type' => 'text', diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 3f9eadbbb..3189694b2 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -1128,7 +1128,7 @@ class AdminTranslationsControllerCore extends AdminController continue; include_once(_PS_CLASS_DIR_.$classFile); $prefix_key = substr($classFile, 0, -4); - if (!class_exists($prefix_key, false)) + if (!class_exists($prefix_key, false) && !class_exists($prefix_key.'Core', false)) continue; if (!is_subclass_of($prefix_key, 'ObjectModel')) continue; diff --git a/translations/fr/fields.php b/translations/fr/fields.php index 680c7539a..5788ea2ea 100644 --- a/translations/fr/fields.php +++ b/translations/fr/fields.php @@ -2,6 +2,7 @@ global $_FIELDS; $_FIELDS = array(); +$_FIELDS['Address_71581233bcc121fcc409ecce9317fbde'] = 'Id client'; $_FIELDS['AddressFormat_1ddcb92ade31c8fbd370001f9b29a7d9'] = 'format'; $_FIELDS['Configuration_b068931cc450442b63f5b3d276ea4297'] = 'nom'; $_FIELDS['Configuration_c79c16c41a33108866a9a4c785c73f4f'] = 'ID de groupe de la boutique'; @@ -99,6 +100,7 @@ $_FIELDS['Profile_b068931cc450442b63f5b3d276ea4297'] = 'nom'; $_FIELDS['QuickAccess_2a304a1348456ccd2234cd71a81bd338'] = 'lien'; $_FIELDS['QuickAccess_48df2d0e8fcf6f9fe7809d5ea0cd2691'] = 'nouvelle_fenêtre'; $_FIELDS['QuickAccess_b068931cc450442b63f5b3d276ea4297'] = 'nom'; +$_FIELDS['SpecificPriceRule_dc99776458b68786a9e903854e23a483'] = 'A partir de la quantité'; $_FIELDS['Tab_672070865d6470b0b9c251e275faaa30'] = 'ID de l\'onglet mère'; $_FIELDS['Tab_4757fe07fd492a8be0ea6a760d683d6e'] = 'position'; $_FIELDS['Tab_22884db148f0ffb0d830ba431102b0b5'] = 'module';