diff --git a/intaro.retailcrm/export/export_setup.php b/intaro.retailcrm/export/export_setup.php
index 05a06418..b4161b35 100644
--- a/intaro.retailcrm/export/export_setup.php
+++ b/intaro.retailcrm/export/export_setup.php
@@ -562,7 +562,7 @@ if ($STEP === 1) {
                             ?>
                             </tbody>
                         </table>
-                        <button class="adm-btn-save add-custom-row" type="button">Добавить</button>
+                        <button class="adm-btn-save add-custom-row" type="button"><?= GetMessage('ADD_PROPERTY');?></button>
                         <br>
                         <br>
                     </div>
@@ -764,7 +764,6 @@ if ($STEP === 1) {
 
         function propertyChange(obj) {
             let selectedOption = $(obj).find('option')[obj.selectedIndex];
-            console.log(selectedOption);
 
             if (selectedOption.className === 'not-highloadblock') {
                 let objId = '#' + obj.id;
@@ -873,314 +872,6 @@ if ($STEP === 1) {
 
             return select;
         }
-
-        const setupFieldsListElement = $('input[name="SETUP_FIELDS_LIST"]');
-        let customProps = {};
-        let customPropsToDelete = {};
-        const setupFieldsParamsToFill = [
-            'iblockPropertySku_',
-            'iblockPropertyUnitSku_',
-            'iblockPropertyProduct_',
-            'iblockPropertyUnitProduct_',
-            'highloadblockb_hlsys_marking_code_group_',
-            'highloadblock_productb_hlsys_marking_code_group_',
-            'highloadblockeshop_color_reference_',
-            'highloadblock_producteshop_color_reference_',
-            'highloadblockeshop_brand_reference_',
-            'highloadblock_producteshop_brand_reference_'
-        ];
-
-        $('.add-custom-row').click(function () {
-            createCustomPropsRaw($(this));
-        });
-
-        $(document).on('click', '#delete-new-custom-row', function () {
-            deleteCustomPropRow($(this));
-        });
-
-        $(document).on('click', '#delete-custom-row', function () {
-            let buttonElem = $(this);
-            addCustomPropToDelete(buttonElem);
-            deleteCustomPropRow(buttonElem);
-        });
-
-        $(document).on('blur', 'input[name="custom-property-title"]', function () {
-            let inputElem = $(this);
-            let newPropertyTitle = inputElem.val();
-
-            if (!newPropertyTitle) {
-                return;
-            }
-
-            let newPropertyCode = getUniquePropertyCode(newPropertyTitle);
-            addCustomPropCodeToSelectAttributes(newPropertyCode, inputElem);
-        });
-
-        $('#submit-form').submit(function (formEvent) {
-            formEvent.preventDefault();
-            let savePromise = null;
-            let deletePromise = null;
-            let formElem = formEvent.currentTarget;
-            let profileId = $($('input[name="PROFILE_ID"]')).val();
-
-            setCustomProperties();
-
-            if (Object.keys(customProps).length > 0) {
-                savePromise = BX.ajax.runAction('intaro:retailcrm.api.customexportprops.save', {
-                    json: {
-                        properties: customProps,
-                        profileId: profileId
-                    },
-                }).then(addParamsToSetupFieldsList());
-            }
-
-            if (Object.keys(customPropsToDelete).length > 0) {
-                deletePromise = BX.ajax.runAction('intaro:retailcrm.api.customexportprops.delete', {
-                    json: {
-                        properties: customPropsToDelete,
-                        profileId: profileId
-                    },
-                }).then(deleteParamsFromSetupFieldsList());
-            }
-
-            const promises = [savePromise, deletePromise].filter(Boolean);
-
-            if (promises.length > 0) {
-                Promise.all(promises)
-                    .finally(() => {
-                        formElem.submit();
-                    });
-            } else {
-                formElem.submit();
-            }
-        });
-
-        function deleteCustomPropRow(deleteButton)
-        {
-           deleteButton.closest('tr').remove();
-        }
-
-        function addCustomPropToDelete(deleteButton)
-        {
-            let deletedPropTitle = deleteButton.closest('td').siblings().filter('.custom-property-title').text().trim();
-            let deletedPropCode = deleteButton.siblings().filter('select').first().data('type');
-            let customPropCatalogId = deleteButton.closest('.iblockExportTable').data('type');
-
-            let values = {
-                'code': deletedPropCode,
-                'title': deletedPropTitle,
-            };
-
-            if (customPropsToDelete.hasOwnProperty(customPropCatalogId)) {
-                customPropsToDelete[customPropCatalogId].push(values);
-            } else {
-                customPropsToDelete[customPropCatalogId] = [values];
-            }
-        }
-
-        function addCustomPropCodeToSelectAttributes(customPropCode, customPropTitleElem)
-        {
-            let selectElements = customPropTitleElem.closest('.custom-property-row').find('td select');
-            let catalogId = customPropTitleElem.closest('.iblockExportTable').data('type');
-
-            selectElements.each(function (index, element) {
-               let selectElem = $(element);
-               let newSelectIdValue = selectElem.attr('id').match(/^[^_]*_/)[0] + customPropCode + catalogId;
-               let newSelectNameValue = selectElem.attr('name').match(/^[^_]*_/)[0] + customPropCode + `[${catalogId}]`;
-
-               selectElem.attr('id', newSelectIdValue);
-               selectElem.attr('name', newSelectNameValue);
-               selectElem.data('type', customPropCode);
-               triggerSelectChange(selectElem);
-            });
-        }
-
-        function triggerSelectChange(selectElem)
-        {
-            if (selectElem.val().length > 0) {
-                selectElem.trigger('change', [self]);
-            }
-        }
-
-        function setCustomProperties()
-        {
-            let customPropertiesRows = $('.custom-property-row');
-
-            if (customPropertiesRows.length === 0) {
-                return;
-            }
-
-            let customPropertyCatalogId;
-            let customPropertyTitle = '';
-            let customPropertyCode = '';
-            let productPropertyMatch = '';
-            let offerPropertyMatch = '';
-
-            let catalogIds = [];
-            customPropertiesRows.each(function (index, propertyRow) {
-                let propertyRowObj = $(propertyRow);
-                customPropertyCatalogId = propertyRowObj.closest('.iblockExportTable').data('type');
-
-                customPropertyTitle = propertyRowObj.find('input[name="custom-property-title"]').val();
-
-                if (!customPropertyTitle) {
-                    return true;
-                }
-
-                customPropertyCode = getUniquePropertyCode(customPropertyTitle);
-                productPropertyMatch = propertyRowObj.find('select[name=custom-product-property-select]').val();
-                offerPropertyMatch = propertyRowObj.find('select[name=custom-offer-property-select]').val();
-
-                let values = {
-                    'title': customPropertyTitle,
-                    'code': customPropertyCode,
-                    'productProperty': productPropertyMatch,
-                    'offerProperty': offerPropertyMatch
-                };
-
-                if (catalogIds.indexOf(customPropertyCatalogId) === -1) {
-                    customProps[customPropertyCatalogId] = [values];
-                } else {
-                    customProps[customPropertyCatalogId].push(values);
-                }
-                catalogIds.push(customPropertyCatalogId);
-            });
-        }
-
-        function getUniquePropertyCode(customPropertyTitle)
-        {
-            let uniqueValue = transliterate(customPropertyTitle).replace(/ /g, '_');
-            let counter = 0;
-
-            const setupFieldsListValues = setupFieldsListElement.val().split(',');
-            while (setupFieldsListValues.includes(uniqueValue)) {
-                uniqueValue = `${customPropertyTitle}${++counter}`;
-            }
-
-            return uniqueValue;
-        }
-
-        function addParamsToSetupFieldsList()
-        {
-            let newParams = '';
-
-            if (Object.keys(customProps).length === 0) {
-                return;
-            }
-
-            for (let propertiesByCatalogId of Object.values(customProps)) {
-                propertiesByCatalogId.forEach(function (values) {
-                    setupFieldsParamsToFill.forEach(function (param) {
-                        newParams += ',' + param + values.code;
-                    });
-                });
-            }
-
-            let newValue = setupFieldsListElement.val() + newParams;
-            setupFieldsListElement.val(newValue);
-
-            return true;
-        }
-
-        function deleteParamsFromSetupFieldsList()
-        {
-            let setupFields = setupFieldsListElement.val();
-
-            if (Object.keys(customPropsToDelete).length === 0) {
-                return;
-            }
-
-            for (let propsByCatalogId of Object.values(customPropsToDelete)) {
-                propsByCatalogId.forEach(function (propValues) {
-                    setupFieldsParamsToFill.forEach(function (param) {
-                        let paramToDelete = ',' + param + propValues.code;
-                        setupFields = setupFields.replace(paramToDelete, '');
-                    });
-                });
-            }
-
-            setupFieldsListElement.val(setupFields);
-
-            return true;
-        }
-
-        function createCustomPropsRaw(addRowButton)
-        {
-            let templateRow = $($('#custom-property-template-row').html());
-            let templateSelectElements = templateRow.find('select');
-
-            let prevTableRow = $(addRowButton).prev('table').find('tbody tr:last-child');
-            let lastRawSelectElements = prevTableRow.find('td select');
-
-            lastRawSelectElements.each(function (index, element) {
-                let selectElement = $(element);
-                let templateSelectElement = templateSelectElements[index];
-                fillTemplateSelect(selectElement, templateSelectElement);
-                prevTableRow.after(templateRow);
-            });
-        }
-
-        function fillTemplateSelect(sourceSelectElement, templateSelectElement)
-        {
-            let selectOptions = sourceSelectElement.find('option');
-            selectOptions.each(function (index, element) {
-                let optionElem = $(element);
-                let value = $(optionElem).val();
-                let text = $(optionElem).text();
-
-                $('<option>', { value: value, text: text }).appendTo(templateSelectElement);
-            });
-        }
-
-        function transliterate(titleToTransliterate)
-        {
-            const hasCyrillicChars = /[\u0400-\u04FF]/.test(titleToTransliterate);
-
-            if (!hasCyrillicChars) {
-                return titleToTransliterate;
-            }
-
-            translitedText = '';
-            for (var i = 0; i < titleToTransliterate.length; i++) {
-                switch (titleToTransliterate[i]) {
-                    case 'а': case 'А': translitedText += 'a'; break;
-                    case 'б': case 'Б': translitedText += 'b'; break;
-                    case 'в': case 'В': translitedText += 'v'; break;
-                    case 'г': case 'Г': translitedText += 'g'; break;
-                    case 'д': case 'Д': translitedText += 'd'; break;
-                    case 'е': case 'Е': translitedText += 'e'; break;
-                    case 'ё': case 'Ё': translitedText += 'yo'; break;
-                    case 'ж': case 'Ж': translitedText += 'zh'; break;
-                    case 'з': case 'З': translitedText += 'z'; break;
-                    case 'и': case 'И': translitedText += 'i'; break;
-                    case 'й': case 'Й': translitedText += 'y'; break;
-                    case 'к': case 'К': translitedText += 'k'; break;
-                    case 'л': case 'Л': translitedText += 'l'; break;
-                    case 'м': case 'М': translitedText += 'm'; break;
-                    case 'н': case 'Н': translitedText += 'n'; break;
-                    case 'о': case 'О': translitedText += 'o'; break;
-                    case 'п': case 'П': translitedText += 'p'; break;
-                    case 'р': case 'Р': translitedText += 'r'; break;
-                    case 'с': case 'С': translitedText += 's'; break;
-                    case 'т': case 'Т': translitedText += 't'; break;
-                    case 'у': case 'У': translitedText += 'u'; break;
-                    case 'ф': case 'Ф': translitedText += 'f'; break;
-                    case 'х': case 'Х': translitedText += 'h'; break;
-                    case 'ц': case 'Ц': translitedText += 'c'; break;
-                    case 'ч': case 'Ч': translitedText += 'ch'; break;
-                    case 'ш': case 'Ш': translitedText += 'sh'; break;
-                    case 'щ': case 'Щ': translitedText += 'sch'; break;
-                    case 'ъ': case 'Ъ': translitedText += ''; break;
-                    case 'ы': case 'Ы': translitedText += 'y'; break;
-                    case 'ь': case 'Ь': translitedText += ''; break;
-                    case 'э': case 'Э': translitedText += 'e'; break;
-                    case 'ю': case 'Ю': translitedText += 'yu'; break;
-                    case 'я': case 'Я': translitedText += 'ya'; break;
-                    default: translitedText += titleToTransliterate[i]; break;
-                }
-            }
-            return translitedText;
-        }
     </script>
     <?php
 }
diff --git a/intaro.retailcrm/install/export/bitrix/js/intaro/custom-props-export.js b/intaro.retailcrm/install/export/bitrix/js/intaro/custom-props-export.js
index 35014e28..39d603b5 100644
--- a/intaro.retailcrm/install/export/bitrix/js/intaro/custom-props-export.js
+++ b/intaro.retailcrm/install/export/bitrix/js/intaro/custom-props-export.js
@@ -1,3 +1,311 @@
+const setupFieldsListElement = $('input[name="SETUP_FIELDS_LIST"]');
+let customProps = {};
+let customPropsToDelete = {};
+const setupFieldsParamsToFill = [
+    'iblockPropertySku_',
+    'iblockPropertyUnitSku_',
+    'iblockPropertyProduct_',
+    'iblockPropertyUnitProduct_',
+    'highloadblockb_hlsys_marking_code_group_',
+    'highloadblock_productb_hlsys_marking_code_group_',
+    'highloadblockeshop_color_reference_',
+    'highloadblock_producteshop_color_reference_',
+    'highloadblockeshop_brand_reference_',
+    'highloadblock_producteshop_brand_reference_'
+];
+
+$('.add-custom-row').click(function () {
+    createCustomPropsRaw($(this));
+});
+
+$(document).on('click', '#delete-new-custom-row', function () {
+    deleteCustomPropRow($(this));
+});
+
+$(document).on('click', '#delete-custom-row', function () {
+    let buttonElem = $(this);
+    addCustomPropToDelete(buttonElem);
+    deleteCustomPropRow(buttonElem);
+});
+
+$(document).on('blur', 'input[name="custom-property-title"]', function () {
+    let inputElem = $(this);
+    let newPropertyTitle = inputElem.val();
+
+    if (!newPropertyTitle) {
+        return;
+    }
+
+    let newPropertyCode = getUniquePropertyCode(newPropertyTitle);
+    addCustomPropCodeToSelectAttributes(newPropertyCode, inputElem);
+});
+
+$('#submit-form').submit(function (formEvent) {
+    formEvent.preventDefault();
+    let savePromise = null;
+    let deletePromise = null;
+    let formElem = formEvent.currentTarget;
+    let profileId = $($('input[name="PROFILE_ID"]')).val();
+
+    setCustomProperties();
+
+    if (Object.keys(customProps).length > 0) {
+        savePromise = BX.ajax.runAction('intaro:retailcrm.api.customexportprops.save', {
+            json: {
+                properties: customProps,
+                profileId: profileId
+            },
+        }).then(addParamsToSetupFieldsList());
+    }
+
+    if (Object.keys(customPropsToDelete).length > 0) {
+        deletePromise = BX.ajax.runAction('intaro:retailcrm.api.customexportprops.delete', {
+            json: {
+                properties: customPropsToDelete,
+                profileId: profileId
+            },
+        }).then(deleteParamsFromSetupFieldsList());
+    }
+
+    const promises = [savePromise, deletePromise].filter(Boolean);
+
+    if (promises.length > 0) {
+        Promise.all(promises)
+            .finally(() => {
+                formElem.submit();
+            });
+    } else {
+        formElem.submit();
+    }
+});
+
+function deleteCustomPropRow(deleteButton)
+{
+    deleteButton.closest('tr').remove();
+}
+
+function addCustomPropToDelete(deleteButton)
+{
+    let deletedPropTitle = deleteButton.closest('td').siblings().filter('.custom-property-title').text().trim();
+    let deletedPropCode = deleteButton.siblings().filter('select').first().data('type');
+    let customPropCatalogId = deleteButton.closest('.iblockExportTable').data('type');
+
+    let values = {
+        'code': deletedPropCode,
+        'title': deletedPropTitle,
+    };
+
+    if (customPropsToDelete.hasOwnProperty(customPropCatalogId)) {
+        customPropsToDelete[customPropCatalogId].push(values);
+    } else {
+        customPropsToDelete[customPropCatalogId] = [values];
+    }
+}
+
+function addCustomPropCodeToSelectAttributes(customPropCode, customPropTitleElem)
+{
+    let selectElements = customPropTitleElem.closest('.custom-property-row').find('td select');
+    let catalogId = customPropTitleElem.closest('.iblockExportTable').data('type');
+
+    selectElements.each(function (index, element) {
+        let selectElem = $(element);
+        let newSelectIdValue = selectElem.attr('id').match(/^[^_]*_/)[0] + customPropCode + catalogId;
+        let newSelectNameValue = selectElem.attr('name').match(/^[^_]*_/)[0] + customPropCode + `[${catalogId}]`;
+
+        selectElem.attr('id', newSelectIdValue);
+        selectElem.attr('name', newSelectNameValue);
+        selectElem.data('type', customPropCode);
+        triggerSelectChange(selectElem);
+    });
+}
+
+function triggerSelectChange(selectElem)
+{
+    if (selectElem.val().length > 0) {
+        selectElem.trigger('change', [self]);
+    }
+}
+
+function setCustomProperties()
+{
+    let customPropertiesRows = $('.custom-property-row');
+
+    if (customPropertiesRows.length === 0) {
+        return;
+    }
+
+    let customPropertyCatalogId;
+    let customPropertyTitle = '';
+    let customPropertyCode = '';
+    let productPropertyMatch = '';
+    let offerPropertyMatch = '';
+
+    let catalogIds = [];
+    customPropertiesRows.each(function (index, propertyRow) {
+        let propertyRowObj = $(propertyRow);
+        customPropertyCatalogId = propertyRowObj.closest('.iblockExportTable').data('type');
+
+        customPropertyTitle = propertyRowObj.find('input[name="custom-property-title"]').val();
+
+        if (!customPropertyTitle) {
+            return true;
+        }
+
+        customPropertyCode = getUniquePropertyCode(customPropertyTitle);
+        productPropertyMatch = propertyRowObj.find('select[name=custom-product-property-select]').val();
+        offerPropertyMatch = propertyRowObj.find('select[name=custom-offer-property-select]').val();
+
+        let values = {
+            'title': customPropertyTitle,
+            'code': customPropertyCode,
+            'productProperty': productPropertyMatch,
+            'offerProperty': offerPropertyMatch
+        };
+
+        if (catalogIds.indexOf(customPropertyCatalogId) === -1) {
+            customProps[customPropertyCatalogId] = [values];
+        } else {
+            customProps[customPropertyCatalogId].push(values);
+        }
+        catalogIds.push(customPropertyCatalogId);
+    });
+}
+
+function getUniquePropertyCode(customPropertyTitle)
+{
+    let uniqueValue = transliterate(customPropertyTitle).replace(/ /g, '_');
+    let counter = 0;
+
+    const setupFieldsListValues = setupFieldsListElement.val().split(',');
+    while (setupFieldsListValues.includes(uniqueValue)) {
+        uniqueValue = `${customPropertyTitle}${++counter}`;
+    }
+
+    return uniqueValue;
+}
+
+function addParamsToSetupFieldsList()
+{
+    let newParams = '';
+
+    if (Object.keys(customProps).length === 0) {
+        return;
+    }
+
+    for (let propertiesByCatalogId of Object.values(customProps)) {
+        propertiesByCatalogId.forEach(function (values) {
+            setupFieldsParamsToFill.forEach(function (param) {
+                newParams += ',' + param + values.code;
+            });
+        });
+    }
+
+    let newValue = setupFieldsListElement.val() + newParams;
+    setupFieldsListElement.val(newValue);
+
+    return true;
+}
+
+function deleteParamsFromSetupFieldsList()
+{
+    let setupFields = setupFieldsListElement.val();
+
+    if (Object.keys(customPropsToDelete).length === 0) {
+        return;
+    }
+
+    for (let propsByCatalogId of Object.values(customPropsToDelete)) {
+        propsByCatalogId.forEach(function (propValues) {
+            setupFieldsParamsToFill.forEach(function (param) {
+                let paramToDelete = ',' + param + propValues.code;
+                setupFields = setupFields.replace(paramToDelete, '');
+            });
+        });
+    }
+
+    setupFieldsListElement.val(setupFields);
+
+    return true;
+}
+
+function createCustomPropsRaw(addRowButton)
+{
+    let templateRow = $($('#custom-property-template-row').html());
+    let templateSelectElements = templateRow.find('select');
+
+    let prevTableRow = $(addRowButton).prev('table').find('tbody tr:last-child');
+    let lastRawSelectElements = prevTableRow.find('td select');
+
+    lastRawSelectElements.each(function (index, element) {
+        let selectElement = $(element);
+        let templateSelectElement = templateSelectElements[index];
+        fillTemplateSelect(selectElement, templateSelectElement);
+        prevTableRow.after(templateRow);
+    });
+}
+
+function fillTemplateSelect(sourceSelectElement, templateSelectElement)
+{
+    let selectOptions = sourceSelectElement.find('option');
+    selectOptions.each(function (index, element) {
+        let optionElem = $(element);
+        let value = $(optionElem).val();
+        let text = $(optionElem).text();
+
+        $('<option>', { value: value, text: text }).appendTo(templateSelectElement);
+    });
+}
+
+function transliterate(titleToTransliterate)
+{
+    const hasCyrillicChars = /[\u0400-\u04FF]/.test(titleToTransliterate);
+
+    if (!hasCyrillicChars) {
+        return titleToTransliterate;
+    }
+
+    translitedText = '';
+    for (var i = 0; i < titleToTransliterate.length; i++) {
+        switch (titleToTransliterate[i]) {
+            case 'а': case 'А': translitedText += 'a'; break;
+            case 'б': case 'Б': translitedText += 'b'; break;
+            case 'в': case 'В': translitedText += 'v'; break;
+            case 'г': case 'Г': translitedText += 'g'; break;
+            case 'д': case 'Д': translitedText += 'd'; break;
+            case 'е': case 'Е': translitedText += 'e'; break;
+            case 'ё': case 'Ё': translitedText += 'yo'; break;
+            case 'ж': case 'Ж': translitedText += 'zh'; break;
+            case 'з': case 'З': translitedText += 'z'; break;
+            case 'и': case 'И': translitedText += 'i'; break;
+            case 'й': case 'Й': translitedText += 'y'; break;
+            case 'к': case 'К': translitedText += 'k'; break;
+            case 'л': case 'Л': translitedText += 'l'; break;
+            case 'м': case 'М': translitedText += 'm'; break;
+            case 'н': case 'Н': translitedText += 'n'; break;
+            case 'о': case 'О': translitedText += 'o'; break;
+            case 'п': case 'П': translitedText += 'p'; break;
+            case 'р': case 'Р': translitedText += 'r'; break;
+            case 'с': case 'С': translitedText += 's'; break;
+            case 'т': case 'Т': translitedText += 't'; break;
+            case 'у': case 'У': translitedText += 'u'; break;
+            case 'ф': case 'Ф': translitedText += 'f'; break;
+            case 'х': case 'Х': translitedText += 'h'; break;
+            case 'ц': case 'Ц': translitedText += 'c'; break;
+            case 'ч': case 'Ч': translitedText += 'ch'; break;
+            case 'ш': case 'Ш': translitedText += 'sh'; break;
+            case 'щ': case 'Щ': translitedText += 'sch'; break;
+            case 'ъ': case 'Ъ': translitedText += ''; break;
+            case 'ы': case 'Ы': translitedText += 'y'; break;
+            case 'ь': case 'Ь': translitedText += ''; break;
+            case 'э': case 'Э': translitedText += 'e'; break;
+            case 'ю': case 'Ю': translitedText += 'yu'; break;
+            case 'я': case 'Я': translitedText += 'ya'; break;
+            default: translitedText += titleToTransliterate[i]; break;
+        }
+    }
+    return translitedText;
+}
+/*
 $(document).on('blur', 'input[name="custom-property-title"]', function () {
     let inputElem = $(this);
     let newPropertyTitle = inputElem.val();
@@ -205,4 +513,4 @@ function transliterate(titleToTransliterate)
         }
     }
     return translitedText;
-}
\ No newline at end of file
+}*/
diff --git a/intaro.retailcrm/lang/ru/icml_export_setup.php b/intaro.retailcrm/lang/ru/icml_export_setup.php
index 73c8dd25..7222eab6 100644
--- a/intaro.retailcrm/lang/ru/icml_export_setup.php
+++ b/intaro.retailcrm/lang/ru/icml_export_setup.php
@@ -47,3 +47,4 @@ $MESS["UNIT_MEASUREMENT_KG"] = "кг.";
 $MESS['BASE_PRICE'] = 'Базовая цена';
 $MESS['WAIT'] = 'Загрузка...';
 $MESS["OFFERS_VALUE"] = "Максимальное количество торговых предложений у товара";
+$MESS["ADD_PROPERTY"] = "Добавить";
diff --git a/intaro.retailcrm/lib/component/advanced/installertrait.php b/intaro.retailcrm/lib/component/advanced/installertrait.php
index 10ce356e..353216b0 100644
--- a/intaro.retailcrm/lib/component/advanced/installertrait.php
+++ b/intaro.retailcrm/lib/component/advanced/installertrait.php
@@ -33,6 +33,16 @@ trait InstallerTrait
         if (!$file->isExists()) {
             $file->putContents("");
         }
+
+        $pathFrom = $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/' . Constants::MODULE_ID . '/install/export/bitrix/js/intaro/custom-props-export.js';
+
+        CopyDirFiles(
+            $pathFrom,
+            $_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/intaro',
+            true,
+            true,
+            false
+        );
     }
 
     public function subscriptionSetup()
diff --git a/intaro.retailcrm/lib/controller/customexportprops.php b/intaro.retailcrm/lib/controller/customexportprops.php
index 79568b63..340671cb 100644
--- a/intaro.retailcrm/lib/controller/customexportprops.php
+++ b/intaro.retailcrm/lib/controller/customexportprops.php
@@ -41,17 +41,26 @@ class CustomExportProps extends Controller
             $profileId
         );
 
+        $idCategories = array_keys($props);
+
+        if ($idCategories !== []) {
+            $settingsService->setProfileCatalogs($idCategories);//сразу заменяет и create и update
+        }
+
         foreach ($props as $catalogId => $propsArray) {
             $catalogCustomProps = [];
+
             foreach ($propsArray as $property) {
                 $catalogCustomProps[] = [
                     'code' => $property['code'],
                     'title' => $property['title']
                 ];
             }
+
             $settingsService
                 ->setCatalogCustomPropsOptionName($catalogId)
-                ->saveCustomProps($catalogId, $catalogCustomProps);
+                ->saveCustomProps($catalogCustomProps)
+            ;
         }
     }
 
@@ -80,4 +89,4 @@ class CustomExportProps extends Controller
                 ->removeCustomProps($catalogCustomProps, $catalogId);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/intaro.retailcrm/lib/icml/settingsservice.php b/intaro.retailcrm/lib/icml/settingsservice.php
index 842ee7fe..c40945bf 100644
--- a/intaro.retailcrm/lib/icml/settingsservice.php
+++ b/intaro.retailcrm/lib/icml/settingsservice.php
@@ -131,7 +131,7 @@ class SettingsService
      * @param array       $arOldSetupVars
      * @param string|null $action
      */
-    private function __construct(array $arOldSetupVars, ?string $action, string $profileId)
+    private function __construct(array $arOldSetupVars, ?string $action, ?string $profileId)
     {
         $this->arOldSetupVars = $arOldSetupVars;
         $this->action = $action;
@@ -147,9 +147,10 @@ class SettingsService
         $this->getPriceTypes();
         $this->getVatRates();
 
-        $this->exportProfileId = $profileId;
+        $this->exportProfileId = $profileId ?? 'tmp';
         $this->profileCatalogsOptionName = sprintf('exportProfileId_%s_catalogs', $this->exportProfileId);
         //$this->setProfileCatalogsOptionName();//Установка названия каталога смысла не вижу от метода
+        $this->linkNewProfile();
         $this->deleteEmptyProfileCatalogs();
 
         $this->customPropList = $this->getNewProps();//получаеют свойства с разделениекм на каталоги. Но не понял при чем custom в названии
@@ -847,16 +848,15 @@ class SettingsService
         $this->setOptionEntry($this->catalogCustomPropsOptionName, $propsString);
     }
 
-    public function saveCustomProps(string $catalogId, array $newProps): void
+    public function saveCustomProps(array $newProps): void
     {
-        $currentProps = $this->getCustomProps();
+        $currentProps = $this->getCustomProps();//проверка сущестования комбинации профиля и категории
 
         if (is_null($currentProps)) {
-            $this->setProfileCatalog($catalogId);
             $this->setCustomProps($newProps);
         } else {
-            $updatedProps = array_merge($currentProps, $newProps);
-            $this->updateProfileCatalogs($catalogId);
+            $updatedProps = array_merge($currentProps, $newProps);//TODO также только добавляет но не удаляет, проверить как работает
+            //$this->updateProfileCatalogs($catalogId);
             $this->updateCustomProps($updatedProps);
         }
     }
@@ -872,18 +872,18 @@ class SettingsService
         return $catalogs;
     }
 
-    private function setProfileCatalog(string $catalogId): void
+    public function setProfileCatalogs(array $catalogsId): void
     {
-        $catalogs = serialize([$catalogId]);
+        $catalogs = serialize($catalogsId);
         $this->setOptionEntry($this->profileCatalogsOptionName, $catalogs);
     }
 
-    private function updateProfileCatalogs(string $catalogId): void
+    private function updateProfileCatalogs(string $catalogId): void //TODO Возможно метод для удаления, проверить
     {
         $currentCatalogs = $this->getProfileCatalogs();
 
-        if (!in_array($catalogId, $currentCatalogs)) {
-            $updatedCatalogs = serialize(array_merge($currentCatalogs, [$catalogId]));
+        if (!in_array($catalogId, $currentCatalogs)) {//TODO: только добавляет но не удаляет исправить
+            $updatedCatalogs = serialize(array_merge($currentCatalogs, [$catalogId])); // только здесь объединение каталогов в профиль
             $this->updateOptionEntry($this->profileCatalogsOptionName, $updatedCatalogs);
         }
     }
@@ -912,7 +912,7 @@ class SettingsService
 
     private function setOptionEntry(string $name, string $value)
     {
-        $setResult = COption::SetOptionString(self::MODULE_ID, $name, $value);
+        COption::SetOptionString(self::MODULE_ID, $name, $value);
     }
 
     private function updateOptionEntry(string $name, string $value)
@@ -925,4 +925,37 @@ class SettingsService
     {
         COption::RemoveOption(self::MODULE_ID, $name);
     }
+
+    private function linkNewProfile(): void
+    {
+        $this->profileCatalogsOptionName; // профиль со списокм каталогов
+        $this->exportProfileId; // id профиля
+
+        $currentProfileCatalogs = unserialize(COption::GetOptionString(self::MODULE_ID, $this->profileCatalogsOptionName));
+
+        if (!$currentProfileCatalogs) {
+            $tmpProfileName = 'exportProfileId_tmp_catalogs';
+            $currentProfileCatalogs = unserialize(COption::GetOptionString(self::MODULE_ID, $tmpProfileName));
+
+            if ($currentProfileCatalogs) {
+                $this->setOptionEntry($this->profileCatalogsOptionName, serialize($currentProfileCatalogs));
+                $this->deleteOptionEntry($tmpProfileName);
+            }
+        }
+
+        foreach ($currentProfileCatalogs as $catalogId) {
+            $optionName = sprintf('exportCustomProps_ProfileId_%s_catalogId_%s', $this->exportProfileId, $catalogId);
+            $propsCatalog = unserialize(COption::GetOptionString(self::MODULE_ID, $optionName));
+
+            if (!$propsCatalog) {
+                $tmpOptionName = sprintf('exportCustomProps_ProfileId_%s_catalogId_%s', 'tmp', $catalogId);
+                $propsCatalog = unserialize(COption::GetOptionString(self::MODULE_ID, $tmpOptionName));
+
+                if ($propsCatalog) {
+                    $this->setOptionEntry($optionName, serialize($propsCatalog));
+                    $this->deleteOptionEntry($tmpOptionName);
+                }
+            }
+        }
+    }
 }
diff --git a/intaro.retailcrm/updater.php b/intaro.retailcrm/updater.php
index 415e67d8..f6162177 100644
--- a/intaro.retailcrm/updater.php
+++ b/intaro.retailcrm/updater.php
@@ -1187,41 +1187,22 @@ function update()
     Loader::includeModule('highloadblock');
     COption::SetOptionString('intaro.retailcrm', 'api_version', 'v5');
 
-    $orderDischarge = Option::get('intaro.retailcrm', 'order_discharge');
-
-    if ($orderDischarge === '0') {
-        $dateAgent = new DateTime();
-
-        $dateAgent->add('PT60S');
-        CAgent::AddAgent(
-            'RCrmActions::uploadOrdersAgent();',
-            'intaro.retailcrm',
-            'N',
-            180,
-            $dateAgent->format('d.m.Y H:i:s'),
-            'Y',
-            $dateAgent->format('d.m.Y H:i:s'),
-            30
-        );
-        
-        COption::SetOptionString('intaro.retailcrm', 'order_discharge', '2');
-    }
+    loadJsExport();
 }
 
-function createCustomPropertyFile()
+function loadJsExport()
 {
-    $path = $_SERVER['DOCUMENT_ROOT'] . '/local/';
+    $pathFrom = $_SERVER['DOCUMENT_ROOT'] . '/bitrix/modules/intaro.retailcrm/install/export/bitrix/js/intaro/custom-props-export.js';
 
-    CheckDirPath($path);
-
-    $file = new \Bitrix\Main\IO\File($path . 'icml_property_retailcrm.txt', $siteId = null);
-
-    if (!$file->isExists()) {
-        $file->putContents("");
-    }
+    CopyDirFiles(
+        $pathFrom,
+        $_SERVER['DOCUMENT_ROOT'] . '/bitrix/js/intaro',
+        true,
+        true,
+        false
+    );
 }
 
-
 try {
     update();
 } catch (Main\ObjectPropertyException | Main\ArgumentException | Main\SystemException $exception) {