RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-22 13:26:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch '0.3.9'

Browse Source 
Conflicts:
	intaro.intarocrm/export/export_setup.php
	intaro.intarocrm/install/version.php
This commit is contained in:
Ilyas Salikhov 2013-08-26 10:42:47 +04:00
commit 0e4988e415
4 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intaro.intarocrm/description.ru Normal file
View File

@ -0,0 +1,2 @@
* При настройке выгрузки каталога сделано необязательным указание артикула товара
* Доработан скрипт генерации ICML-файла в части работы со спецсимволами

3
intaro.intarocrm/export/export_setup.php
View File

@ -120,6 +120,7 @@ if ($STEP==1)
$boolAll = true; $boolAll = true;
} }
?> ?>
@ -189,11 +190,13 @@ if ($STEP==1)
if ($arIBlock['OLD_PROPERTY_SELECT'] == $prop["CODE"]){ if ($arIBlock['OLD_PROPERTY_SELECT'] == $prop["CODE"]){
echo " selected"; echo " selected";
} else { } else {
if ($arIBlock['OLD_PROPERTY_SELECT'] != "") {
if ($prop["CODE"] == "ARTICLE" || if ($prop["CODE"] == "ARTICLE" ||
$prop["CODE"] == "ART" || $prop["CODE"] == "ART" ||
$prop["CODE"] == "ARTNUMBER" ) $prop["CODE"] == "ARTNUMBER" )
echo " selected"; echo " selected";
} }
}
?> ?>

4
intaro.intarocrm/install/version.php
View File

@ -1,5 +1,5 @@
<? <?
$arModuleVersion = array( $arModuleVersion = array(
'VERSION' => '0.3.8', "VERSION" => "0.3.9",
'VERSION_DATE' => '2013-08-14 19:32:00', "VERSION_DATE" => "2013-08-21 18:32:00",
); );

10
intaro.intarocrm/updater.php Normal file
View File

@ -0,0 +1,10 @@
<?
if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_run.php')) {
unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_run.php');
}
$updater->CopyFiles("install/export/intarocrm_run.php", "php_interface/include/catalog_export/intarocrm_run.php");
if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_setup.php')) {
unlink($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/include/catalog_export/intarocrm_setup.php');
}
$updater->CopyFiles("install/export/intarocrm_setup.php", "php_interface/include/catalog_export/intarocrm_setup.php");